@automattic/vip 4.1.4 → 4.1.6

package/assets/dev-env.lando.template.yml.ejs

@@ -42,6 +42,10 @@ services:
       env_file:
         - .env
       environment:
+        VIP_DEVENV_MAILPIT: "<%= mailpit ? '1' : '0' %>"
+        VIP_DEVENV_PHOTON: "<%= photon ? '1' : '0' %>"
+        VIP_DEVENV_ELASTICSEARCH: "<%= elasticsearch ? '1' : '0' %>"
+        VIP_DEVENV_DEMO_APP: "<%= appCode.mode == 'image' ? '1' : '0' %>"
         XDEBUG: <%= xdebug ? 'enable' : 'disable' %>
 <% if ( xdebugConfig ) { %>
         XDEBUG_CONFIG: "<%= xdebugConfig %>"
@@ -86,7 +90,7 @@ services:
             nocopy: true
 <% wpVolumes() %>
     run_as_root:
-      - chown www-data:www-data /wp/wp-content/mu-plugins /wp/config /wp/log /wp/wp-content/uploads /wp
+      - chown www-data:www-data /wp/wp-content/mu-plugins /wp/config /wp/log /wp/wp-content/uploads /wp /wp/wp-config.php
 <% if ( appCode.mode == 'image' ) { %>
       - chown www-data:www-data /wp/wp-content/plugins
 <% } %>
@@ -204,7 +208,7 @@ services:
         - devtools:/dev-tools
         - scripts:/scripts
     initOnly: true
-    entrypoint: /bin/sh -c '/usr/bin/rsync -ac --delete --chown=${LANDO_HOST_USER_ID}:${LANDO_HOST_GROUP_ID} /wp/ /shared/; /usr/bin/rsync -ac --chown=${LANDO_HOST_USER_ID}:${LANDO_HOST_GROUP_ID} --delete /dev-tools-orig/ /dev-tools/'
+    entrypoint: /bin/sh -c 'if [ ! -f /shared/wp-config.php ]; then /usr/bin/rsync -ac --chown=${LANDO_HOST_USER_ID}:${LANDO_HOST_GROUP_ID} /wp/wp-config.php /shared/; fi; /usr/bin/rsync -ac --delete --exclude=/wp-config.php --chown=${LANDO_HOST_USER_ID}:${LANDO_HOST_GROUP_ID} /wp/ /shared/; /usr/bin/rsync -ac --chown=${LANDO_HOST_USER_ID}:${LANDO_HOST_GROUP_ID} --delete /dev-tools-orig/ /dev-tools/'
     volumes:
       devtools:
       scripts:

package/config/config.local.json

@@ -0,0 +1,6 @@
+{
+  "tracksUserType": "vip:user_id",
+  "tracksAnonUserType": "anon",
+  "tracksEventPrefix": "vip_cli_dev_",
+  "environment": "development"
+}

package/dist/bin/vip-config-software-get.js

@@ -68,6 +68,15 @@ const VALID_INCLUDES = ['available_versions'];
       throw new _userError.default(`Software settings for ${component} are not supported for this environment.`);
     }
     chosenSettings = [softwareSettings[component]];
+
+    // Only `get php` asks for the running patch version, since Parker reads it from Kubernetes.
+    if (component === 'php') {
+      const runningVersion = await (0, _software.getRunningPhpVersion)(opt.app.id, opt.env.id);
+      chosenSettings = [{
+        ...softwareSettings.php,
+        runningVersion
+      }];
+    }
   } else {
     chosenSettings = [softwareSettings.wordpress, softwareSettings.php, softwareSettings.muplugins, softwareSettings.nodejs];
   }

package/dist/bin/vip-wp.js

@@ -74,14 +74,52 @@ const unpipeStreamsFromProcess = ({
   }
   outStream.unpipe(process.stdout);
 };
+const finishCommand = ({
+  subShellRl,
+  commonTrackingParams,
+  isSubShell,
+  exitCode = 0,
+  job = currentJob
+}) => {
+  if (job !== currentJob || job.finished) {
+    return;
+  }
+  currentJob.finished = true;
+  clearTimeout(currentJob.exitTimer);
+  clearTimeout(currentJob.retryTimer);
+  subShellRl.clearLine();
+  commandRunning = false;
+  const tracking = (0, _tracker.trackEvent)('wpcli_command_end', commonTrackingParams).catch(() => {});
+  currentJob.socket.close();
+  unpipeStreamsFromProcess({
+    stdin: currentJob.stdinStream,
+    stdout: currentJob.stdoutStream
+  });
+  currentOffset = 0;
+  if (!isSubShell) {
+    subShellRl.close();
+    void tracking.catch(() => {}).finally(() => process.exit(exitCode));
+    return;
+  }
+  if (exitCode) {
+    console.log(_chalk.default.red(`Error: WP-CLI command failed with exit code ${exitCode}`));
+  }
+  (0, _readline2.safeResume)(subShellRl);
+  (0, _readline2.safePrompt)(subShellRl);
+};
 const bindStreamEvents = ({
   subShellRl,
   commonTrackingParams,
   isSubShell,
   stdoutStream
 }) => {
+  const job = currentJob;
+  const isCurrentStream = () => job === currentJob && !job.finished && stdoutStream === job.stdoutStream;
   const criticalErrors = ['ECONNRESET', 'ETIMEDOUT', 'EHOSTUNREACH', 'ENOSPC', 'EACCES', 'EMFILE', 'ENOMEM'];
   stdoutStream.on('error', err => {
+    if (!isCurrentStream()) {
+      return;
+    }
     commandRunning = false;
     if (criticalErrors.includes(err.code)) {
       console.error(`Error: ${err.message}`);
@@ -90,26 +128,21 @@ const bindStreamEvents = ({
       debug('Error: ' + err.message);
     }
   });
-  stdoutStream.on('end', async () => {
-    subShellRl.clearLine();
-    commandRunning = false;
-    await (0, _tracker.trackEvent)('wpcli_command_end', commonTrackingParams);
-
-    // Tell socket.io to stop trying to connect
-    currentJob.socket.close();
-    unpipeStreamsFromProcess({
-      stdin: currentJob.stdinStream,
-      stdout: currentJob.stdoutStream
-    });
-
-    // Reset offset
-    currentOffset = 0;
-    if (!isSubShell) {
-      subShellRl.close();
-      process.exit();
+  stdoutStream.on('end', () => {
+    // Allow the server's exit event to deliver its status after stdout EOF.
+    if (isCurrentStream()) {
+      clearTimeout(job.exitTimer);
+      job.exitTimer = setTimeout(() => {
+        if (isCurrentStream()) {
+          finishCommand({
+            subShellRl,
+            commonTrackingParams,
+            isSubShell,
+            job
+          });
+        }
+      }, 2000);
     }
-    (0, _readline2.safeResume)(subShellRl);
-    (0, _readline2.safePrompt)(subShellRl);
   });
 };
 const getTokenForCommand = async (appId, envId, command) => {
@@ -142,7 +175,7 @@ const getTokenForCommand = async (appId, envId, command) => {
  * @returns {Error}
  */
 const onSocketError = err => err;
-const launchCommandAndGetStreams = async ({
+const launchCommandAndGetStreams = ({
   socket,
   guid,
   inputToken,
@@ -151,7 +184,9 @@ const launchCommandAndGetStreams = async ({
   const stdoutStream = _socket2.default.createStream();
   const stdinStream = _socket2.default.createStream();
   stdoutStream.on('data', data => {
-    currentOffset = data.length + currentOffset;
+    if (currentJob?.stdoutStream === stdoutStream && !currentJob.finished) {
+      currentOffset += data.length;
+    }
   });
 
   // TODO handle all arguments
@@ -166,25 +201,48 @@ const launchCommandAndGetStreams = async ({
     offset
   };
   (0, _socket2.default)(socket).emit('cmd', data, stdinStream, stdoutStream);
-  socket.on('unauthorized', err => {
+  const onUnauthorized = err => {
+    if (currentJob?.socket !== socket || currentJob.finished) {
+      return;
+    }
     console.log('There was an error with the authentication:', err.message);
-  });
-  socket.on('cancel', message => {
+  };
+  const onCancel = message => {
+    if (currentJob?.socket !== socket || currentJob.finished) {
+      return;
+    }
     socket.close();
     exit.withError(`Cancel received from server: ${message}`);
-  });
+  };
   (0, _socket2.default)(socket).off('error', onSocketError).on('error', onSocketError);
-  socket.on('error', err => {
+  const onError = err => {
+    if (currentJob?.socket !== socket || currentJob.finished) {
+      return;
+    }
     if (err === 'Rate limit exceeded') {
       console.log(_chalk.default.red('\nError:'), 'Rate limit exceeded: Please wait a moment and try again.');
       return;
     }
     console.log(err);
-  });
+  };
+  if (currentJob?.socket === socket) {
+    for (const [event, handler] of Object.entries(currentJob.socketHandlers)) {
+      socket.off(event, handler);
+    }
+  }
+  const socketHandlers = {
+    unauthorized: onUnauthorized,
+    cancel: onCancel,
+    error: onError
+  };
+  for (const [event, handler] of Object.entries(socketHandlers)) {
+    socket.on(event, handler);
+  }
   return {
     stdinStream,
     stdoutStream,
-    socket
+    socket,
+    socketHandlers
   };
 };
 const bindReconnectEvents = ({
@@ -194,12 +252,20 @@ const bindReconnectEvents = ({
   commonTrackingParams,
   isSubShell
 }) => {
+  const job = currentJob;
+  const isCurrentJob = () => job === currentJob && !job.finished;
   currentJob.socket.io.removeAllListeners('reconnect');
   currentJob.socket.io.removeAllListeners('reconnect_attempt');
   currentJob.socket.removeAllListeners('retry');
   currentJob.socket.removeAllListeners('connect_error');
-  currentJob.socket.io.on('reconnect', async () => {
+  currentJob.socket.removeAllListeners('exit');
+  currentJob.socket.io.on('reconnect', () => {
+    if (!isCurrentJob()) {
+      return;
+    }
     debug('socket.io: reconnect');
+    clearTimeout(job.exitTimer);
+    clearTimeout(job.retryTimer);
 
     // Close old streams
     unpipeStreamsFromProcess({
@@ -207,7 +273,8 @@ const bindReconnectEvents = ({
       stdout: currentJob.stdoutStream
     });
     (0, _tracker.trackEvent)('wpcli_command_reconnect', commonTrackingParams).catch(() => {});
-    currentJob = await launchCommandAndGetStreams({
+    job.finished = true;
+    currentJob = launchCommandAndGetStreams({
       socket: currentJob.socket,
       guid: cliCommand.guid,
       inputToken,
@@ -236,37 +303,58 @@ const bindReconnectEvents = ({
     // Resume readline interface
     (0, _readline2.safeResume)(subShellRl);
   });
-  currentJob.socket.on('retry', async () => {
+  currentJob.socket.on('retry', () => {
+    if (!isCurrentJob()) {
+      return;
+    }
     debug('socket: retry');
-    setTimeout(() => {
-      currentJob.socket.io.engine.close();
+    clearTimeout(job.retryTimer);
+    job.retryTimer = setTimeout(() => {
+      if (isCurrentJob()) {
+        job.socket.io.engine.close();
+      }
     }, 5000);
   });
   currentJob.socket.on('connect_error', () => {
+    if (!isCurrentJob()) {
+      return;
+    }
     debug('socket: connect_error; forcing the preference for websocket');
 
     // Force the preference for WebSocket in case we see an error during connection
     // https://socket.io/docs/v3/client-initialization/#low-level-engine-options
     currentJob.socket.io.opts.transports = ['websocket', 'polling'];
   });
-  currentJob.socket.on('exit', async ({
+  currentJob.socket.on('exit', ({
     exitCode,
     message
   }) => {
+    if (!isCurrentJob()) {
+      return;
+    }
     debug('socket: exit. Code: %d. Message: %s', exitCode, message);
     if (message) {
       console.log(message);
     }
     currentJob.stdinStream.destroy();
     currentJob.stdoutStream.destroy();
-    currentJob.socket.close();
-    process.exit(exitCode);
+    finishCommand({
+      subShellRl,
+      commonTrackingParams,
+      isSubShell,
+      exitCode
+    });
   });
   currentJob.socket.io.on('reconnect_attempt', attempt => {
+    if (!isCurrentJob()) {
+      return;
+    }
     debug('There was an error connecting to the server. Retrying...');
     if (attempt > 1) {
       return;
     }
+    clearTimeout(job.exitTimer);
+    clearTimeout(job.retryTimer);
 
     // create a new input stream so that we can still catch things like SIGINT while reconnecting
     if (currentJob.stdinStream) {
@@ -399,7 +487,7 @@ const examples = [{
     }
 
     // Handle plain return / newline
-    if (!line) {
+    if (!line && !seenWP) {
       (0, _readline2.safePrompt)(subShellRl);
       return;
     }
@@ -432,8 +520,9 @@ const examples = [{
       return;
     }
     (0, _readline2.safePause)(subShellRl);
+    countSIGINT = 0;
     let result;
-    const wpCliCmd = commandState.command.replace(/^wp\s+/, '');
+    const wpCliCmd = commandState.command.trimStart().replace(/^wp\s+/, '');
     seenWP = false;
     (0, _helpers.resetState)(commandState);
     try {
@@ -478,7 +567,7 @@ const examples = [{
       },
       agent: (0, _proxyAgent.createProxyAgent)(_api.API_HOST)
     });
-    currentJob = await launchCommandAndGetStreams({
+    currentJob = launchCommandAndGetStreams({
       socket,
       guid: cliCommand.guid,
       inputToken

package/dist/lib/client-file-uploader.js

@@ -137,6 +137,9 @@ const UPLOAD_PART_SIZE = 16 * _fileSize.MB_IN_BYTES;
 // How many parts will upload at the same time
 const MAX_CONCURRENT_PART_UPLOADS = 5;
 
+// How many times a presigned URL request is retried after a network error, 429 or 5xx
+const SIGNED_REQUEST_RETRIES = 3;
+
 // TODO: Replace with a proper definitions once we convert lib/cli/command.js to TypeScript
 
 const getWorkingTempDir = () => (0, _promises.mkdtemp)(_path.default.join(_os.default.tmpdir(), 'vip-client-file-uploader'));
@@ -417,7 +420,7 @@ async function getSignedUploadRequestData({
   etagResults,
   uploadId = undefined,
   partNumber = undefined
-}) {
+}, retries = SIGNED_REQUEST_RETRIES) {
   const WPVIP_DEPLOY_TOKEN = process.env.WPVIP_DEPLOY_TOKEN;
   const reqOptions = {
     method: 'POST',
@@ -436,11 +439,37 @@ async function getSignedUploadRequestData({
       Authorization: `Bearer ${WPVIP_DEPLOY_TOKEN}`
     };
   }
-  const response = await (0, _http.default)('/upload/site-import-presigned-url', reqOptions);
-  if (response.status !== 200) {
-    throw new Error((await response.text()) || response.statusText);
+  // A large upload makes one of these requests per part, so a single network blip
+  // would otherwise abort the whole upload. The JSON body is re-serialized on every
+  // call, so retrying is safe.
+  for (let attempt = 0;; attempt++) {
+    const isLastAttempt = attempt >= retries;
+    let response;
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      response = await (0, _http.default)('/upload/site-import-presigned-url', reqOptions);
+      if (response.status === 200) {
+        // Body transport failures must stay inside the retry boundary.
+        // eslint-disable-next-line no-await-in-loop
+        return await response.json();
+      }
+    } catch (err) {
+      if (err instanceof SyntaxError || isLastAttempt) {
+        throw withCauseMessage(err);
+      }
+      response = undefined;
+    }
+    const isRetryableStatus = response && (response.status === 429 || response.status >= 500);
+    if (response && (!isRetryableStatus || isLastAttempt)) {
+      // eslint-disable-next-line no-await-in-loop
+      throw new Error((await response.text()) || response.statusText);
+    }
+
+    // eslint-disable-next-line no-await-in-loop
+    await response?.body?.cancel().catch(err => debug('Response cleanup failed: %s', err));
+    // eslint-disable-next-line no-await-in-loop
+    await (0, _promises3.setTimeout)(Math.pow(2, attempt) * 1000); // 1000, 2000, 4000
   }
-  return response.json();
 }
 async function checkFileAccess(fileName) {
   return (0, _promises.access)(fileName, _fs.constants.R_OK);

package/dist/lib/config/software.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.triggerUpdate = exports.promptForUpdate = exports.getUpdateResult = exports.formatSoftwareSettings = exports.appQueryFragments = exports.appQuery = void 0;
+exports.triggerUpdate = exports.promptForUpdate = exports.getUpdateResult = exports.getRunningPhpVersion = exports.formatSoftwareSettings = exports.appQueryFragments = exports.appQuery = void 0;
 var _debug = _interopRequireDefault(require("debug"));
 var _enquirer = require("enquirer");
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
@@ -117,6 +117,21 @@ const updateJobQuery = (0, _graphqlTag.default)`
 		}
 	}
 `;
+
+// Only `config software get php` asks for this: Parker reads it from the environment's Kubernetes pods.
+const runningPhpVersionQuery = (0, _graphqlTag.default)`
+	query SoftwareRunningPhpVersion($appId: Int!, $envId: Int!) {
+		app(id: $appId) {
+			environments(id: $envId) {
+				softwareSettings {
+					php {
+						runningVersion
+					}
+				}
+			}
+		}
+	}
+`;
 const COMPONENT_NAMES = {
   wordpress: 'WordPress',
   php: 'PHP',
@@ -253,7 +268,32 @@ const triggerUpdate = async variables => {
     variables
   });
 };
+
+/**
+ * The full PHP version running on the environment (e.g. 8.2.35), or null when Parker can't
+ * determine it. Errors fall back to the configured version instead of failing the command.
+ */
 exports.triggerUpdate = triggerUpdate;
+const getRunningPhpVersion = async (appId, envId) => {
+  try {
+    const api = (0, _api.default)({
+      exitOnError: false
+    });
+    const result = await api.query({
+      query: runningPhpVersionQuery,
+      variables: {
+        appId,
+        envId
+      },
+      fetchPolicy: 'network-only'
+    });
+    return result.data?.app?.environments?.[0]?.softwareSettings?.php?.runningVersion ?? null;
+  } catch (error) {
+    debug('Unable to fetch the running PHP version', error);
+    return null;
+  }
+};
+exports.getRunningPhpVersion = getRunningPhpVersion;
 const _getLatestJob = async (appId, envId) => {
   const api = (0, _api.default)();
   const result = await api.query({
@@ -301,7 +341,7 @@ const getUpdateResult = async (appId, envId) => {
 };
 exports.getUpdateResult = getUpdateResult;
 const formatSoftwareSettings = (softwareSetting, includes, format) => {
-  let version = softwareSetting.current.version;
+  let version = softwareSetting.runningVersion || softwareSetting.current.version;
   if (softwareSetting.slug === 'wordpress' && !softwareSetting.pinned) {
     version += ' (managed updates)';
   }

package/dist/lib/dev-environment/dev-environment-cli.js

@@ -746,16 +746,17 @@ async function getTagChoices() {
   });
 }
 
-// Credentials stored in instance data must never be sent as event props (PLTFRM-2820)
-const TRACKING_EXCLUDED_KEYS = new Set(['adminPassword', 'autologinKey']);
+// Keep this list in sync with vip-next's devEnvTrackingInfo. Instance data may
+// contain credentials and user-defined fields that must stay local (PLTFRM-2820).
+const TRACKING_ALLOWED_KEYS = ['siteSlug', 'wpTitle', 'multisite', 'wordpress', 'muPlugins', 'appCode', 'mediaRedirectDomain', 'phpmyadmin', 'xdebug', 'xdebugConfig', 'mariadb', 'php', 'elasticsearch', 'mailpit', 'photon', 'cron', 'pullAfter', 'version'];
 function getEnvTrackingInfo(slug) {
   try {
     const envData = (0, _devEnvironmentCore.readEnvironmentData)(slug);
     const result = {
       slug
     };
-    for (const key of Object.keys(envData)) {
-      if (TRACKING_EXCLUDED_KEYS.has(key)) {
+    for (const key of TRACKING_ALLOWED_KEYS) {
+      if (!Object.hasOwn(envData, key)) {
         continue;
       }
 
@@ -764,7 +765,9 @@ function getEnvTrackingInfo(slug) {
       const value = _devEnvironment.DEV_ENVIRONMENT_COMPONENTS_WITH_WP.includes(key) ? JSON.stringify(envData[key]) : envData[key];
       result[snakeCasedKey] = value;
     }
-    result.php = result.php.replace(/^[^:]+:/, '');
+    if (typeof result.php === 'string') {
+      result.php = result.php.replace(/^[^:]+:/, '');
+    }
     return result;
   } catch {
     return {

package/dist/lib/dev-environment/dev-environment-core.js

@@ -176,7 +176,7 @@ function preProcessInstanceData(instanceData) {
     version: _devEnvironment.DEV_ENVIRONMENT_VERSION,
     overrides: instanceData.overrides ?? ''
   };
-  if (instanceData.mediaRedirectDomain && !/^http/.exec(instanceData.mediaRedirectDomain)) {
+  if (instanceData.mediaRedirectDomain && !/^https?:/.test(instanceData.mediaRedirectDomain)) {
     // We need to make sure the redirect is an absolute path
     newInstanceData.mediaRedirectDomain = `https://${instanceData.mediaRedirectDomain}`;
   }

package/helpers/generate-docs.js

@@ -25,7 +25,12 @@ async function runCommand( subcommands ) {
 
 const USAGE_REGEXP = /Usage: (.*)/;
 const COMMAND_REGEXP = /(\S+)\s+(.*)/;
-const OPTION_REGEXP = /(-\S, --\S+)\s+(.*)/;
+// Short flag is optional (e.g. `--skip-rebuild`), and a `[value]` / `<value>` placeholder belongs to
+// the option, not the description. Option and description are separated by 2+ spaces, so wrapped
+// description lines that mention a flag (e.g. "use --editor=vscode instead") aren't treated as options.
+// Anchored with no overlapping quantifiers, and only ever run against our own --help output.
+// eslint-disable-next-line security/detect-unsafe-regex
+const OPTION_REGEXP = /^((?:-\S, )?--[^\s,]+(?: [<[]\S+[>\]])?)(?:\s{2,}(.*))?$/;
 
 const SECTION_COMMAND = 'commands';
 const SECTION_OPTIONS = 'options';
@@ -82,14 +87,15 @@ const parseOutput = output => {
 		}
 		if ( currentSection === SECTION_OPTIONS ) {
 			if ( line.match( OPTION_REGEXP ) ) {
-				const [ , option, description ] = line.match( OPTION_REGEXP );
+				const [ , option, description = '' ] = line.match( OPTION_REGEXP );
 				result.options.push( {
 					option,
 					description,
 				} );
 			} else if ( result.options.length ) {
 				// Continuation of a wrapped option description.
-				result.options[ result.options.length - 1 ].description += ' ' + line;
+				const lastOption = result.options[ result.options.length - 1 ];
+				lastOption.description = [ lastOption.description, line ].filter( Boolean ).join( ' ' );
 			} else {
 				console.error( 'Unknown option', line );
 			}

package/node_modules/@apollo/client/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @apollo/client
 
+## 4.3.4
+
+### Patch Changes
+
+- [#13497](https://github.com/apollographql/apollo-client/pull/13497) [`41d604c`](https://github.com/apollographql/apollo-client/commit/41d604c6cc33582571739b8cd35b9feac21f26b2) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix an issue where a list field selected more than once with different selection sets lost the fields that only one of the selections included while a `@defer` boundary elsewhere in the query was still pending when using the `GraphQL17Alpha9Handler`. The results of all selections of the list field are now merged.
+
+- [#13457](https://github.com/apollographql/apollo-client/pull/13457) [`22746bb`](https://github.com/apollographql/apollo-client/commit/22746bb03a8c45a2a1919d3c5804b3b74fb8d871) Thanks [@phryneas](https://github.com/phryneas)! - Fixed a bug where `streamFieldInfo` might not have been passed into custom merge functions for
+  `@stream` directives that had an aliased field in the path.
+
+- [#13457](https://github.com/apollographql/apollo-client/pull/13457) [`22746bb`](https://github.com/apollographql/apollo-client/commit/22746bb03a8c45a2a1919d3c5804b3b74fb8d871) Thanks [@phryneas](https://github.com/phryneas)! - Fix `Missing field` errors being logged when writing `@defer` results where a parent field is selected both inside and outside of a deferred fragment. Fields whose `@defer` boundary has not been delivered from the network are no longer reported as missing.
+
+- [#13453](https://github.com/apollographql/apollo-client/pull/13453) [`9bb3a41`](https://github.com/apollographql/apollo-client/commit/9bb3a416e2b343650a6a5faf62a17e65509421ae) Thanks [@wassim-k](https://github.com/wassim-k)! - Unregister the watch when an immediate `cache.watch` broadcast throws. Previously the watch was added to the cache before its first read, and a read that threw left the watch registered while the caller never received the unsubscribe function, so it could not be removed and every later broadcast ran into the same failing read.
+
+- [#13457](https://github.com/apollographql/apollo-client/pull/13457) [`22746bb`](https://github.com/apollographql/apollo-client/commit/22746bb03a8c45a2a1919d3c5804b3b74fb8d871) Thanks [@phryneas](https://github.com/phryneas)! - `Defer20220824Handler`: fix a situation where `dataState` would show up as `completed` with incremental errors instead of staying `streaming`.
+
+## 4.3.3
+
+### Patch Changes
+
+- [#13479](https://github.com/apollographql/apollo-client/pull/13479) [`0ab2579`](https://github.com/apollographql/apollo-client/commit/0ab25794ad88a2f7755323c5218ae64f933f287f) Thanks [@phryneas](https://github.com/phryneas)! - Fix a memory leak in `isDeferredFragment`/`isStreamField`
+
+## 4.3.2
+
+### Patch Changes
+
+- [#13467](https://github.com/apollographql/apollo-client/pull/13467) [`7786771`](https://github.com/apollographql/apollo-client/commit/778677132860b061ded75a7702a951bae0de7fe5) Thanks [@SSpirate11](https://github.com/SSpirate11)! - Fix an unhandled `AbortError` promise rejection that occurred when unsubscribing from a multipart HTTP subscription.
+
+## 4.3.1
+
+### Patch Changes
+
+- [#13464](https://github.com/apollographql/apollo-client/pull/13464) [`37f700e`](https://github.com/apollographql/apollo-client/commit/37f700eb4c65ec7683111e128bca087d4a97cf41) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix an issue where `useLazyQuery` did not rerender with new `variables` until the network request had completed when calling `execute` with new variables while a request was already in-flight.
+
 ## 4.3.0
 
 ### Minor Changes
@@ -465,6 +498,11 @@
 
   This may add one network request in these cache-feud scenarios.
 
+- [#13275](https://github.com/apollographql/apollo-client/pull/13275) [`263f987`](https://github.com/apollographql/apollo-client/commit/263f987bf8a604412baf4d54140f6978bd8d9afe) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Make sure scalars are correctly returned for mutations and subscriptions.
+
+> [!NOTE]
+> This change affects cache reads after mutations as mutations now reread from the cache after each execution that writes a result to the cache. Previously mutations only reread from the cache when an `update` function was provided. This can have an effect on the result if you have union or interface types in the mutation but forget to include `possibleTypes` which might return a result that doesn't include the interface/union fields.
+
 ### Patch Changes
 
 - [#13408](https://github.com/apollographql/apollo-client/pull/13408) [`7a5164d`](https://github.com/apollographql/apollo-client/commit/7a5164d3ce21b7f88f625588ec72dbce8ea33810) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix `dataState` to report `"streaming"` instead of `"partial"` when `returnPartialData` is `true` and the cache result is missing only `@defer` fields.

package/node_modules/@apollo/client/__cjs/cache/core/cache.cjs

@@ -171,7 +171,7 @@ class ApolloCache {
             if (environment_1.__DEV__) {
                 const actualFragmentName = fragmentName || (0, internal_1.getFragmentDefinition)(fragment).name.value;
                 if (id === undefined) {
-                    __DEV__ && invariant_1.invariant.warn(126, actualFragmentName);
+                    __DEV__ && invariant_1.invariant.warn(127, actualFragmentName);
                 }
             }
             return id;