@atlaskit/collab-provider 39.0.2 → 39.0.4

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/collab-provider
 
+## 39.0.4
+
+### Patch Changes
+
+- [`750248fa12247`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/750248fa12247) -
+  GCP collaboration connects with WebSocket first and polling fallback behind
+  platform_editor_gcp_collab_ws_first. Detect GCP using the Edge cookie, the shared cloud detector,
+  or the staging hostname.
+
+## 39.0.3
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 39.0.2
 
 ### Patch Changes

package/dist/cjs/helpers/utils.js

@@ -14,12 +14,12 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _scrubAdf = _interopRequireDefault(require("@atlaskit/adf-utils/scrub-adf"));
+var _cloudProvider = require("@atlaskit/atlassian-context/cloud-provider");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _customErrors = require("../errors/custom-errors");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-// eslint-disable-next-line require-unicode-regexp
-var GCP_TENANT_PATTERN = /^.*-cdp-\w+\.jira-dev\.com$/;
+var GCP_STAGING_TENANT_PATTERN = /^(?:[\0-\t\x0B\f\x0E-\u2027\u202A-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*-cdp-[0-9A-Z_a-z]+\.jira-dev\.com$/;
 var createLogger = exports.createLogger = function createLogger(prefix) {
   var color = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'blue';
   return (
@@ -308,10 +308,11 @@ function toObfuscatedSteps(_x3) {
   return _toObfuscatedSteps.apply(this, arguments);
 }
 /**
- * Copied from confluence/next/packages/graphql/src/utils/gcpDomainUtils.ts
- * Checks if the current domain is a GCP tenant matching the pattern: .*-cdp-{cdp-id}\.jira-dev\.com
- * @param {string | undefined} hostname optional hostname to evaluate
- * @returns {boolean} true if the domain matches the GCP tenant pattern
+ * Keep all three checks: AWS-served Bifrost responses can overwrite the shared
+ * detector's cookie to AWS even for a GCP tenant (https://hello.atlassian.net/browse/EDGE-10729).
+ * The Edge cookie covers that case; the shared detector also supports SSR, and
+ * the hostname check covers missing or unreliable cloud-provider cookies in staging.
+ * Any GCP signal is sufficient; an AWS value must not veto the remaining checks.
  */
 function _toObfuscatedSteps() {
   _toObfuscatedSteps = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(steps) {
@@ -335,8 +336,16 @@ function _toObfuscatedSteps() {
   return _toObfuscatedSteps.apply(this, arguments);
 }
 function isGCPtenant(hostname) {
-  if (!hostname) {
-    return false;
+  var edgeProvider;
+  try {
+    var _document$cookie$spli;
+    edgeProvider = typeof document === 'undefined' ? undefined : (_document$cookie$spli = document.cookie.split(';').map(function (cookie) {
+      return cookie.trim();
+    }).find(function (cookie) {
+      return cookie.startsWith('Atl-Ctx-Cloud-Service-Provider=');
+    })) === null || _document$cookie$spli === void 0 ? void 0 : _document$cookie$spli.split('=')[1];
+  } catch (_unused) {
+    // Cookie access can be unavailable; continue with the shared detector and staging fallback.
   }
-  return GCP_TENANT_PATTERN.test(hostname);
+  return edgeProvider === 'GCP' || (0, _cloudProvider.isGoogleCloudPlatform)() || Boolean(hostname && GCP_STAGING_TENANT_PATTERN.test(hostname));
 }

package/dist/cjs/socket-io-provider.js

@@ -26,7 +26,7 @@ function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, analyticsH
   var socketIOOptions = _config.SOCKET_IO_OPTIONS;
   // Default: polling first, with WebSocket upgrade fallback
   var transports = ['polling', 'websocket'];
-  var presenceWebSocketFirst = false;
+  var webSocketFirst = false;
 
   // Determine transport strategy based on connection type and tenant.
   // https://socket.io/docs/v4/client-options/#transports
@@ -49,12 +49,14 @@ function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, analyticsH
       socketIOOptions = _config.SOCKET_IO_OPTIONS_WITH_HIGH_JITTER;
       if ((0, _fg.fg)('platform_editor_presence_ws_first_with_fallback')) {
         transports = ['websocket', 'polling'];
-        presenceWebSocketFirst = true;
+        webSocketFirst = true;
       }
       break;
     case 'gcp-collab':
-      // GCP: use WebSocket for all collab editing as well
-      if ((0, _fg.fg)('collab_edit_via_websocket_only_for_gcp')) {
+      if ((0, _fg.fg)('platform_editor_gcp_collab_ws_first')) {
+        transports = ['websocket', 'polling'];
+        webSocketFirst = true;
+      } else if ((0, _fg.fg)('collab_edit_via_websocket_only_for_gcp')) {
         transports = ['websocket'];
       }
       break;
@@ -75,16 +77,16 @@ function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, analyticsH
     withCredentials: true,
     transports: transports,
     // When WebSocket is rejected while opening, try polling in the same attempt
-    tryAllTransports: presenceWebSocketFirst,
+    tryAllTransports: webSocketFirst,
     path: path ? "".concat(path, "/socket.io") : "/".concat(pathname.split('/')[1], "/socket.io"),
     auth: auth,
     extraHeaders: extraHeaders,
     query: _objectSpread({
       sourceId: documentAri === null || documentAri === void 0 ? void 0 : documentAri.split('/')[1]
-    }, presenceWebSocketFirst ? extraHeaders : {})
+    }, webSocketFirst ? extraHeaders : {})
   });
-  if (presenceWebSocketFirst) {
-    addPollingFallback(client, url, analyticsHelper);
+  if (webSocketFirst) {
+    addPollingFallback(client, url, isPresenceOnly ? (0, _fg.fg)('platform_editor_presence_ws_restore_after_upgrade') : true, analyticsHelper);
   }
   return client;
 }
@@ -98,11 +100,11 @@ var WEBSOCKET_CONNECT_TIMEOUT_MS = exports.WEBSOCKET_CONNECT_TIMEOUT_MS = 8000;
  * or fails at the transport level. A server rejection (error with `data`) proves WebSocket works, so it never
  * triggers the fallback. Once switched, all reconnects of this socket use polling-first.
  *
- * With `platform_editor_presence_ws_restore_after_upgrade`, the fallback is no longer sticky and errors no longer
+ * With `restoreAfterUpgrade`, the fallback is no longer sticky and errors no longer
  * trigger it. Errors that reach `connect_error` mean polling failed too (network down), or WebSocket already opened.
  * Once WebSocket carries data, on open or after an upgrade from polling, go back to WebSocket-first.
  */
-function addPollingFallback(client, url, analyticsHelper) {
+function addPollingFallback(client, url, restoreAfterUpgrade, analyticsHelper) {
   var timer;
   var webSocketWorks = false;
   var isWebSocketFirst = function isWebSocketFirst() {
@@ -137,7 +139,7 @@ function addPollingFallback(client, url, analyticsHelper) {
   };
   startTimer();
   client.io.on('reconnect_attempt', startTimer);
-  if ((0, _fg.fg)('platform_editor_presence_ws_restore_after_upgrade')) {
+  if (restoreAfterUpgrade) {
     // The engine opens when the server handshake arrives, so the auth token fetch is not timed
     client.io.on('open', function () {
       clearTimeout(timer);

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/collab-provider";
-var version = exports.version = "39.0.1";
+var version = exports.version = "39.0.3";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/helpers/utils.js

@@ -1,8 +1,8 @@
 import scrubAdf from '@atlaskit/adf-utils/scrub-adf';
+import { isGoogleCloudPlatform } from '@atlaskit/atlassian-context/cloud-provider';
 import { sendableSteps } from '@atlaskit/prosemirror-collab';
 import { CustomError } from '../errors/custom-errors';
-// eslint-disable-next-line require-unicode-regexp
-const GCP_TENANT_PATTERN = /^.*-cdp-\w+\.jira-dev\.com$/;
+const GCP_STAGING_TENANT_PATTERN = /^.*-cdp-\w+\.jira-dev\.com$/u;
 export const createLogger = (prefix, color = 'blue') =>
 // Ignored via go/ees005
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -256,14 +256,19 @@ export async function toObfuscatedSteps(steps) {
 }
 
 /**
- * Copied from confluence/next/packages/graphql/src/utils/gcpDomainUtils.ts
- * Checks if the current domain is a GCP tenant matching the pattern: .*-cdp-{cdp-id}\.jira-dev\.com
- * @param {string | undefined} hostname optional hostname to evaluate
- * @returns {boolean} true if the domain matches the GCP tenant pattern
+ * Keep all three checks: AWS-served Bifrost responses can overwrite the shared
+ * detector's cookie to AWS even for a GCP tenant (https://hello.atlassian.net/browse/EDGE-10729).
+ * The Edge cookie covers that case; the shared detector also supports SSR, and
+ * the hostname check covers missing or unreliable cloud-provider cookies in staging.
+ * Any GCP signal is sufficient; an AWS value must not veto the remaining checks.
  */
 export function isGCPtenant(hostname) {
-  if (!hostname) {
-    return false;
+  let edgeProvider;
+  try {
+    var _document$cookie$spli;
+    edgeProvider = typeof document === 'undefined' ? undefined : (_document$cookie$spli = document.cookie.split(';').map(cookie => cookie.trim()).find(cookie => cookie.startsWith('Atl-Ctx-Cloud-Service-Provider='))) === null || _document$cookie$spli === void 0 ? void 0 : _document$cookie$spli.split('=')[1];
+  } catch {
+    // Cookie access can be unavailable; continue with the shared detector and staging fallback.
   }
-  return GCP_TENANT_PATTERN.test(hostname);
+  return edgeProvider === 'GCP' || isGoogleCloudPlatform() || Boolean(hostname && GCP_STAGING_TENANT_PATTERN.test(hostname));
 }

package/dist/es2019/socket-io-provider.js

@@ -15,7 +15,7 @@ export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, ana
   let socketIOOptions = SOCKET_IO_OPTIONS;
   // Default: polling first, with WebSocket upgrade fallback
   let transports = ['polling', 'websocket'];
-  let presenceWebSocketFirst = false;
+  let webSocketFirst = false;
 
   // Determine transport strategy based on connection type and tenant.
   // https://socket.io/docs/v4/client-options/#transports
@@ -38,12 +38,14 @@ export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, ana
       socketIOOptions = SOCKET_IO_OPTIONS_WITH_HIGH_JITTER;
       if (fg('platform_editor_presence_ws_first_with_fallback')) {
         transports = ['websocket', 'polling'];
-        presenceWebSocketFirst = true;
+        webSocketFirst = true;
       }
       break;
     case 'gcp-collab':
-      // GCP: use WebSocket for all collab editing as well
-      if (fg('collab_edit_via_websocket_only_for_gcp')) {
+      if (fg('platform_editor_gcp_collab_ws_first')) {
+        transports = ['websocket', 'polling'];
+        webSocketFirst = true;
+      } else if (fg('collab_edit_via_websocket_only_for_gcp')) {
         transports = ['websocket'];
       }
       break;
@@ -64,18 +66,18 @@ export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, ana
     withCredentials: true,
     transports,
     // When WebSocket is rejected while opening, try polling in the same attempt
-    tryAllTransports: presenceWebSocketFirst,
+    tryAllTransports: webSocketFirst,
     path: path ? `${path}/socket.io` : `/${pathname.split('/')[1]}/socket.io`,
     auth,
     extraHeaders,
     query: {
       sourceId: documentAri === null || documentAri === void 0 ? void 0 : documentAri.split('/')[1],
       // Browsers cannot send extraHeaders on a WebSocket handshake, so the BE reads these from the query too
-      ...(presenceWebSocketFirst ? extraHeaders : {})
+      ...(webSocketFirst ? extraHeaders : {})
     }
   });
-  if (presenceWebSocketFirst) {
-    addPollingFallback(client, url, analyticsHelper);
+  if (webSocketFirst) {
+    addPollingFallback(client, url, isPresenceOnly ? fg('platform_editor_presence_ws_restore_after_upgrade') : true, analyticsHelper);
   }
   return client;
 }
@@ -89,11 +91,11 @@ export const WEBSOCKET_CONNECT_TIMEOUT_MS = 8000;
  * or fails at the transport level. A server rejection (error with `data`) proves WebSocket works, so it never
  * triggers the fallback. Once switched, all reconnects of this socket use polling-first.
  *
- * With `platform_editor_presence_ws_restore_after_upgrade`, the fallback is no longer sticky and errors no longer
+ * With `restoreAfterUpgrade`, the fallback is no longer sticky and errors no longer
  * trigger it. Errors that reach `connect_error` mean polling failed too (network down), or WebSocket already opened.
  * Once WebSocket carries data, on open or after an upgrade from polling, go back to WebSocket-first.
  */
-function addPollingFallback(client, url, analyticsHelper) {
+function addPollingFallback(client, url, restoreAfterUpgrade, analyticsHelper) {
   let timer;
   let webSocketWorks = false;
   const isWebSocketFirst = () => {
@@ -126,7 +128,7 @@ function addPollingFallback(client, url, analyticsHelper) {
   };
   startTimer();
   client.io.on('reconnect_attempt', startTimer);
-  if (fg('platform_editor_presence_ws_restore_after_upgrade')) {
+  if (restoreAfterUpgrade) {
     // The engine opens when the server handshake arrives, so the auth token fetch is not timed
     client.io.on('open', () => {
       clearTimeout(timer);

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/collab-provider";
-export const version = "39.0.1";
+export const version = "39.0.3";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/helpers/utils.js

@@ -4,10 +4,10 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import scrubAdf from '@atlaskit/adf-utils/scrub-adf';
+import { isGoogleCloudPlatform } from '@atlaskit/atlassian-context/cloud-provider';
 import { sendableSteps } from '@atlaskit/prosemirror-collab';
 import { CustomError } from '../errors/custom-errors';
-// eslint-disable-next-line require-unicode-regexp
-var GCP_TENANT_PATTERN = /^.*-cdp-\w+\.jira-dev\.com$/;
+var GCP_STAGING_TENANT_PATTERN = /^(?:[\0-\t\x0B\f\x0E-\u2027\u202A-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*-cdp-[0-9A-Z_a-z]+\.jira-dev\.com$/;
 export var createLogger = function createLogger(prefix) {
   var color = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'blue';
   return (
@@ -297,10 +297,11 @@ export function toObfuscatedSteps(_x3) {
 }
 
 /**
- * Copied from confluence/next/packages/graphql/src/utils/gcpDomainUtils.ts
- * Checks if the current domain is a GCP tenant matching the pattern: .*-cdp-{cdp-id}\.jira-dev\.com
- * @param {string | undefined} hostname optional hostname to evaluate
- * @returns {boolean} true if the domain matches the GCP tenant pattern
+ * Keep all three checks: AWS-served Bifrost responses can overwrite the shared
+ * detector's cookie to AWS even for a GCP tenant (https://hello.atlassian.net/browse/EDGE-10729).
+ * The Edge cookie covers that case; the shared detector also supports SSR, and
+ * the hostname check covers missing or unreliable cloud-provider cookies in staging.
+ * Any GCP signal is sufficient; an AWS value must not veto the remaining checks.
  */
 function _toObfuscatedSteps() {
   _toObfuscatedSteps = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(steps) {
@@ -324,8 +325,16 @@ function _toObfuscatedSteps() {
   return _toObfuscatedSteps.apply(this, arguments);
 }
 export function isGCPtenant(hostname) {
-  if (!hostname) {
-    return false;
+  var edgeProvider;
+  try {
+    var _document$cookie$spli;
+    edgeProvider = typeof document === 'undefined' ? undefined : (_document$cookie$spli = document.cookie.split(';').map(function (cookie) {
+      return cookie.trim();
+    }).find(function (cookie) {
+      return cookie.startsWith('Atl-Ctx-Cloud-Service-Provider=');
+    })) === null || _document$cookie$spli === void 0 ? void 0 : _document$cookie$spli.split('=')[1];
+  } catch (_unused) {
+    // Cookie access can be unavailable; continue with the shared detector and staging fallback.
   }
-  return GCP_TENANT_PATTERN.test(hostname);
+  return edgeProvider === 'GCP' || isGoogleCloudPlatform() || Boolean(hostname && GCP_STAGING_TENANT_PATTERN.test(hostname));
 }

package/dist/esm/socket-io-provider.js

@@ -17,7 +17,7 @@ export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, ana
   var socketIOOptions = SOCKET_IO_OPTIONS;
   // Default: polling first, with WebSocket upgrade fallback
   var transports = ['polling', 'websocket'];
-  var presenceWebSocketFirst = false;
+  var webSocketFirst = false;
 
   // Determine transport strategy based on connection type and tenant.
   // https://socket.io/docs/v4/client-options/#transports
@@ -40,12 +40,14 @@ export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, ana
       socketIOOptions = SOCKET_IO_OPTIONS_WITH_HIGH_JITTER;
       if (fg('platform_editor_presence_ws_first_with_fallback')) {
         transports = ['websocket', 'polling'];
-        presenceWebSocketFirst = true;
+        webSocketFirst = true;
       }
       break;
     case 'gcp-collab':
-      // GCP: use WebSocket for all collab editing as well
-      if (fg('collab_edit_via_websocket_only_for_gcp')) {
+      if (fg('platform_editor_gcp_collab_ws_first')) {
+        transports = ['websocket', 'polling'];
+        webSocketFirst = true;
+      } else if (fg('collab_edit_via_websocket_only_for_gcp')) {
         transports = ['websocket'];
       }
       break;
@@ -66,16 +68,16 @@ export function createSocketIOSocket(url, auth, productInfo, isPresenceOnly, ana
     withCredentials: true,
     transports: transports,
     // When WebSocket is rejected while opening, try polling in the same attempt
-    tryAllTransports: presenceWebSocketFirst,
+    tryAllTransports: webSocketFirst,
     path: path ? "".concat(path, "/socket.io") : "/".concat(pathname.split('/')[1], "/socket.io"),
     auth: auth,
     extraHeaders: extraHeaders,
     query: _objectSpread({
       sourceId: documentAri === null || documentAri === void 0 ? void 0 : documentAri.split('/')[1]
-    }, presenceWebSocketFirst ? extraHeaders : {})
+    }, webSocketFirst ? extraHeaders : {})
   });
-  if (presenceWebSocketFirst) {
-    addPollingFallback(client, url, analyticsHelper);
+  if (webSocketFirst) {
+    addPollingFallback(client, url, isPresenceOnly ? fg('platform_editor_presence_ws_restore_after_upgrade') : true, analyticsHelper);
   }
   return client;
 }
@@ -89,11 +91,11 @@ export var WEBSOCKET_CONNECT_TIMEOUT_MS = 8000;
  * or fails at the transport level. A server rejection (error with `data`) proves WebSocket works, so it never
  * triggers the fallback. Once switched, all reconnects of this socket use polling-first.
  *
- * With `platform_editor_presence_ws_restore_after_upgrade`, the fallback is no longer sticky and errors no longer
+ * With `restoreAfterUpgrade`, the fallback is no longer sticky and errors no longer
  * trigger it. Errors that reach `connect_error` mean polling failed too (network down), or WebSocket already opened.
  * Once WebSocket carries data, on open or after an upgrade from polling, go back to WebSocket-first.
  */
-function addPollingFallback(client, url, analyticsHelper) {
+function addPollingFallback(client, url, restoreAfterUpgrade, analyticsHelper) {
   var timer;
   var webSocketWorks = false;
   var isWebSocketFirst = function isWebSocketFirst() {
@@ -128,7 +130,7 @@ function addPollingFallback(client, url, analyticsHelper) {
   };
   startTimer();
   client.io.on('reconnect_attempt', startTimer);
-  if (fg('platform_editor_presence_ws_restore_after_upgrade')) {
+  if (restoreAfterUpgrade) {
     // The engine opens when the server handshake arrives, so the auth token fetch is not timed
     client.io.on('open', function () {
       clearTimeout(timer);

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/collab-provider";
-export var version = "39.0.1";
+export var version = "39.0.3";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/helpers/utils.d.ts

@@ -91,9 +91,10 @@ export declare function logObfuscatedSteps(oldState: EditorState | null, newStat
 }>;
 export declare function toObfuscatedSteps(steps: readonly ProseMirrorStep[]): Promise<string>;
 /**
- * Copied from confluence/next/packages/graphql/src/utils/gcpDomainUtils.ts
- * Checks if the current domain is a GCP tenant matching the pattern: .*-cdp-{cdp-id}\.jira-dev\.com
- * @param {string | undefined} hostname optional hostname to evaluate
- * @returns {boolean} true if the domain matches the GCP tenant pattern
+ * Keep all three checks: AWS-served Bifrost responses can overwrite the shared
+ * detector's cookie to AWS even for a GCP tenant (https://hello.atlassian.net/browse/EDGE-10729).
+ * The Edge cookie covers that case; the shared detector also supports SSR, and
+ * the hostname check covers missing or unreliable cloud-provider cookies in staging.
+ * Any GCP signal is sufficient; an AWS value must not veto the remaining checks.
  */
 export declare function isGCPtenant(hostname?: string): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "39.0.2",
+	"version": "39.0.4",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -30,7 +30,7 @@
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/prosemirror-collab": "^1.1.0",
 		"@atlaskit/react-ufo": "^8.3.0",
-		"@atlaskit/tmp-editor-statsig": "^247.0.0",
+		"@atlaskit/tmp-editor-statsig": "^248.0.0",
 		"@atlaskit/ufo": "^2.0.0",
 		"@atlaskit/util-service-support": "^7.4.0",
 		"@babel/runtime": "^7.0.0",
@@ -75,6 +75,6 @@
 		}
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^134.0.0"
+		"@atlaskit/editor-common": "^134.1.0"
 	}
 }