@atlaskit/collab-provider 9.37.4 → 9.37.6

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/collab-provider
 
+## 9.37.6
+
+### Patch Changes
+
+- [#137366](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/137366)
+  [`44c333f52bfa6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/44c333f52bfa6) -
+  Avoid left undefined clientId in collab-provider
+
+## 9.37.5
+
+### Patch Changes
+
+- [#136085](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/136085)
+  [`88f45948976f6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/88f45948976f6) -
+  Bump version of socket.io-client used to patch vulnerability in ws library
+
 ## 9.37.4
 
 ### Patch Changes

package/dist/cjs/provider/index.js

@@ -15,6 +15,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _uuid = require("uuid");
 var _emitter = require("../emitter");
 var _channel = require("../channel");
 var _utils = require("../helpers/utils");
@@ -329,6 +330,12 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           throw new _customErrors.ProviderInitialisationError('Collab provider attempted to initialise, but Editor state is missing collab plugin');
         }
         this.clientId = collabPlugin.spec.config.clientID;
+
+        // generate a temporary id as clientId when it is undefined
+        // prefix temp-cp- indicates collab-provider
+        if (!this.clientId) {
+          this.clientId = "temp-cp-".concat((0, _uuid.v4)());
+        }
         this.documentService.setup({
           getState: getState,
           onSyncUpError: onSyncUpError,

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 = "9.37.4";
+var version = exports.version = "9.37.6";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/provider/index.js

@@ -1,4 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { v4 as uuidv4 } from 'uuid';
 import { Emitter } from '../emitter';
 import { Channel } from '../channel';
 import { createLogger } from '../helpers/utils';
@@ -273,6 +274,12 @@ export class Provider extends Emitter {
         throw new ProviderInitialisationError('Collab provider attempted to initialise, but Editor state is missing collab plugin');
       }
       this.clientId = collabPlugin.spec.config.clientID;
+
+      // generate a temporary id as clientId when it is undefined
+      // prefix temp-cp- indicates collab-provider
+      if (!this.clientId) {
+        this.clientId = `temp-cp-${uuidv4()}`;
+      }
       this.documentService.setup({
         getState,
         onSyncUpError,

package/dist/es2019/version-wrapper.js

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

package/dist/esm/provider/index.js

@@ -12,6 +12,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+import { v4 as uuidv4 } from 'uuid';
 import { Emitter } from '../emitter';
 import { Channel } from '../channel';
 import { createLogger } from '../helpers/utils';
@@ -322,6 +323,12 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
           throw new ProviderInitialisationError('Collab provider attempted to initialise, but Editor state is missing collab plugin');
         }
         this.clientId = collabPlugin.spec.config.clientID;
+
+        // generate a temporary id as clientId when it is undefined
+        // prefix temp-cp- indicates collab-provider
+        if (!this.clientId) {
+          this.clientId = "temp-cp-".concat(uuidv4());
+        }
         this.documentService.setup({
           getState: getState,
           onSyncUpError: onSyncUpError,

package/dist/esm/version-wrapper.js

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

package/dist/types/document/document-service.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="lodash" />
 import type { ResolvedEditorState, SyncUpErrorFunction } from '@atlaskit/editor-common/collab';
 import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 import type AnalyticsHelper from '../analytics/analytics-helper';

package/dist/types/types.d.ts

@@ -1,6 +1,6 @@
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
 import type { AnalyticsWebClient } from '@atlaskit/analytics-listeners';
-import type { Manager } from 'socket.io-client';
+import type { Manager, Socket as SocketIOSocket } from 'socket.io-client';
 import type { InternalError } from './errors/internal-errors';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { GetUserType } from './participants/participants-helper';
@@ -27,7 +27,7 @@ export interface Config {
     lifecycle?: Lifecycle;
     storage?: Storage;
     need404?: boolean;
-    createSocket: (path: string, auth?: AuthCallback | InitAndAuthData, productInfo?: ProductInformation) => Socket;
+    createSocket: (path: string, auth?: AuthCallback | InitAndAuthData, productInfo?: ProductInformation) => SocketIOSocket;
     /**
      * @deprecated: Use promise based getAnalyticsWebClient instead
      */

package/dist/types-ts4.5/document/document-service.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="lodash" />
 import type { ResolvedEditorState, SyncUpErrorFunction } from '@atlaskit/editor-common/collab';
 import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 import type AnalyticsHelper from '../analytics/analytics-helper';

package/dist/types-ts4.5/types.d.ts

@@ -1,6 +1,6 @@
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
 import type { AnalyticsWebClient } from '@atlaskit/analytics-listeners';
-import type { Manager } from 'socket.io-client';
+import type { Manager, Socket as SocketIOSocket } from 'socket.io-client';
 import type { InternalError } from './errors/internal-errors';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { GetUserType } from './participants/participants-helper';
@@ -27,7 +27,7 @@ export interface Config {
     lifecycle?: Lifecycle;
     storage?: Storage;
     need404?: boolean;
-    createSocket: (path: string, auth?: AuthCallback | InitAndAuthData, productInfo?: ProductInformation) => Socket;
+    createSocket: (path: string, auth?: AuthCallback | InitAndAuthData, productInfo?: ProductInformation) => SocketIOSocket;
     /**
      * @deprecated: Use promise based getAnalyticsWebClient instead
      */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "9.37.4",
+	"version": "9.37.6",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -23,12 +23,7 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"atlassian": {
-		"team": "Editor: Collaboration",
-		"inPublicMirror": true,
-		"releaseModel": "continuous",
-		"productPushConsumption": [
-			"jira"
-		]
+		"team": "Editor: Collaboration"
 	},
 	"af:exports": {
 		".": "./src/index.ts",
@@ -39,7 +34,7 @@
 	"dependencies": {
 		"@atlaskit/analytics-gas-types": "^5.1.0",
 		"@atlaskit/analytics-listeners": "^8.11.0",
-		"@atlaskit/editor-common": "^88.2.0",
+		"@atlaskit/editor-common": "^88.8.0",
 		"@atlaskit/editor-json-transformer": "^8.18.0",
 		"@atlaskit/editor-prosemirror": "5.0.1",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
@@ -49,7 +44,8 @@
 		"@babel/runtime": "^7.0.0",
 		"eventemitter2": "^4.1.0",
 		"lodash": "^4.17.21",
-		"socket.io-client": "^4.7.1"
+		"socket.io-client": "^4.7.5",
+		"uuid": "^3.1.0"
 	},
 	"techstack": {
 		"@atlassian/frontend": {