diff --git a/app/package.json b/app/package.json index 18338f718c..4585152a11 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "@epam/app", - "version": "6.4.3", + "version": "6.4.4", "description": "EPAM Unified UI landing", "author": "EPAM", "license": "MIT", @@ -18,18 +18,18 @@ "@amplitude/analytics-core": "2.15.0", "@babel/plugin-proposal-private-property-in-object": "7.21.11", "@elastic/apm-rum": "^5.14.0", - "@epam/assets": "6.4.3", - "@epam/electric": "6.4.3", + "@epam/assets": "6.4.4", + "@epam/electric": "6.4.4", "@epam/internal": "0.0.2", - "@epam/loveship": "6.4.3", - "@epam/promo": "6.4.3", - "@epam/uui": "6.4.3", - "@epam/uui-components": "6.4.3", - "@epam/uui-core": "6.4.3", - "@epam/uui-db": "6.4.3", - "@epam/uui-docs": "6.4.3", - "@epam/uui-editor": "6.4.3", - "@epam/uui-timeline": "6.4.3", + "@epam/loveship": "6.4.4", + "@epam/promo": "6.4.4", + "@epam/uui": "6.4.4", + "@epam/uui-components": "6.4.4", + "@epam/uui-core": "6.4.4", + "@epam/uui-db": "6.4.4", + "@epam/uui-docs": "6.4.4", + "@epam/uui-editor": "6.4.4", + "@epam/uui-timeline": "6.4.4", "@floating-ui/react": "0.27.5", "@tanstack/react-query": "^5.17.19", "@udecode/plate-common": "31.3.2", diff --git a/app/src/data/apiDefinition.ts b/app/src/data/apiDefinition.ts index 2a3991bc4f..91c04d8b0a 100644 --- a/app/src/data/apiDefinition.ts +++ b/app/src/data/apiDefinition.ts @@ -32,8 +32,13 @@ export function getApi({ fetchOptions, } : GetApiParams) { const processRequestLocal: IProcessRequest = (url, method, data, options) => { - const opts = fetchOptions ? { fetchOptions, ...options } : options; - return processRequest(url, method, data, opts); + if (!fetchOptions) { + return processRequest(url, method, data, options); + } + return processRequest(url, method, data, { + ...options, + fetchOptions: { ...options?.fetchOptions, ...fetchOptions }, + }); }; return { diff --git a/epam-assets/package.json b/epam-assets/package.json index a75239bc7f..46c8051c54 100644 --- a/epam-assets/package.json +++ b/epam-assets/package.json @@ -1,6 +1,6 @@ { "name": "@epam/assets", - "version": "6.4.3", + "version": "6.4.4", "description": "EPAM Assets Library", "author": "EPAM", "license": "MIT", diff --git a/epam-electric/package.json b/epam-electric/package.json index 27cea9ed24..ae6b2ee214 100644 --- a/epam-electric/package.json +++ b/epam-electric/package.json @@ -1,6 +1,6 @@ { "name": "@epam/electric", - "version": "6.4.3", + "version": "6.4.4", "description": "EPAM UUI components set branded with 'electric' style", "author": "EPAM", "license": "MIT", @@ -12,9 +12,9 @@ "prepublish": "yarn build" }, "dependencies": { - "@epam/uui": "6.4.3", - "@epam/uui-components": "6.4.3", - "@epam/uui-core": "6.4.3" + "@epam/uui": "6.4.4", + "@epam/uui-components": "6.4.4", + "@epam/uui-core": "6.4.4" }, "devDependencies": { "mockdate": "^3.0.5" diff --git a/epam-promo/package.json b/epam-promo/package.json index e79d2e202d..2f53e3e985 100644 --- a/epam-promo/package.json +++ b/epam-promo/package.json @@ -1,6 +1,6 @@ { "name": "@epam/promo", - "version": "6.4.3", + "version": "6.4.4", "description": "EPAM UUI4 components set", "author": "EPAM", "license": "MIT", @@ -12,10 +12,10 @@ "prepublish": "yarn build" }, "dependencies": { - "@epam/assets": "6.4.3", - "@epam/uui": "6.4.3", - "@epam/uui-components": "6.4.3", - "@epam/uui-core": "6.4.3", + "@epam/assets": "6.4.4", + "@epam/uui": "6.4.4", + "@epam/uui-components": "6.4.4", + "@epam/uui-core": "6.4.4", "@types/classnames": "2.2.6", "classnames": "2.2.6" }, diff --git a/extra/package.json b/extra/package.json index c84e3bea9c..3d91b4cee9 100644 --- a/extra/package.json +++ b/extra/package.json @@ -1,6 +1,6 @@ { "name": "@epam/uui-extra", - "version": "6.4.3", + "version": "6.4.4", "description": "EPAM UUI components set branded with 'loveship' style", "author": "EPAM", "license": "MIT", @@ -11,9 +11,9 @@ "build": "ts-node ../uui-build/ts/scripts/buildUuiModule.ts" }, "dependencies": { - "@epam/loveship": "6.4.3", - "@epam/promo": "6.4.3", - "@epam/uui-core": "6.4.3", + "@epam/loveship": "6.4.4", + "@epam/promo": "6.4.4", + "@epam/uui-core": "6.4.4", "immutable": "3.8.2" }, "peerDependencies": { diff --git a/lerna.json b/lerna.json index 6580235f6c..7b9928baf8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "6.4.3", + "version": "6.4.4", "npmClient": "yarn", "useWorkspaces": true, "exact": true diff --git a/loveship/package.json b/loveship/package.json index 5ac8b4c5b0..6f2fbbb4bd 100644 --- a/loveship/package.json +++ b/loveship/package.json @@ -1,6 +1,6 @@ { "name": "@epam/loveship", - "version": "6.4.3", + "version": "6.4.4", "description": "EPAM UUI components set branded with 'loveship' style", "author": "EPAM", "license": "MIT", @@ -12,10 +12,10 @@ "prepublish": "yarn build" }, "dependencies": { - "@epam/assets": "6.4.3", - "@epam/uui": "6.4.3", - "@epam/uui-components": "6.4.3", - "@epam/uui-core": "6.4.3", + "@epam/assets": "6.4.4", + "@epam/uui": "6.4.4", + "@epam/uui-components": "6.4.4", + "@epam/uui-core": "6.4.4", "@types/classnames": "2.2.6", "classnames": "2.2.6" }, diff --git a/server/utils/cspUtil.ts b/server/utils/cspUtil.ts index 7053bb38bd..b97c0f5a56 100644 --- a/server/utils/cspUtil.ts +++ b/server/utils/cspUtil.ts @@ -25,6 +25,7 @@ const CONNECT_ORIGINS = [ 'https://*.googletagmanager.com', 'https://cookie-cdn.cookiepro.com', 'https://codesandbox.io', + 'https://*.csb.app', 'https://geolocation.onetrust.com/', 'https://privacyportal.cookiepro.com/', 'https://cdnjs.cloudflare.com/ajax/libs/prism/1.20.0/themes/prism-coy.min.css.map', diff --git a/templates/uui-cra-template/package.json b/templates/uui-cra-template/package.json index 27a31d98a0..e827543a2f 100644 --- a/templates/uui-cra-template/package.json +++ b/templates/uui-cra-template/package.json @@ -1,6 +1,6 @@ { "name": "@epam/cra-template-uui", - "version": "6.4.3", + "version": "6.4.4", "keywords": [ "UUI", "react", diff --git a/test-utils/package.json b/test-utils/package.json index be9787b09f..3740b83a0e 100644 --- a/test-utils/package.json +++ b/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@epam/uui-test-utils", - "version": "6.4.3", + "version": "6.4.4", "author": "EPAM", "license": "MIT", "private": false, @@ -11,7 +11,7 @@ "prepublish": "yarn build" }, "dependencies": { - "@epam/uui-core": "6.4.3", + "@epam/uui-core": "6.4.4", "@testing-library/dom": "10.4.0", "@testing-library/react": "16.2.0", "@testing-library/user-event": "14.6.1", diff --git a/uui-build/package.json b/uui-build/package.json index 84678e77af..f16dd0cf85 100644 --- a/uui-build/package.json +++ b/uui-build/package.json @@ -1,6 +1,6 @@ { "name": "@epam/uui-build", - "version": "6.4.3", + "version": "6.4.4", "bin": { "epam-uui-build": "./bin/cli.js" }, diff --git a/uui-components/package.json b/uui-components/package.json index 4de0fd378d..5bb7a98b5a 100644 --- a/uui-components/package.json +++ b/uui-components/package.json @@ -1,6 +1,6 @@ { "name": "@epam/uui-components", - "version": "6.4.3", + "version": "6.4.4", "description": "EPAM UUI Components", "author": "EPAM", "license": "MIT", @@ -13,7 +13,7 @@ "prepublish": "yarn build" }, "dependencies": { - "@epam/uui-core": "6.4.3", + "@epam/uui-core": "6.4.4", "@floating-ui/react": "0.27.5", "@types/classnames": "2.2.6", "@types/react-transition-group": "4.4.12", diff --git a/uui-core/package.json b/uui-core/package.json index 278da9a088..f8d91a28fa 100644 --- a/uui-core/package.json +++ b/uui-core/package.json @@ -1,6 +1,6 @@ { "name": "@epam/uui-core", - "version": "6.4.3", + "version": "6.4.4", "description": "EPAM UUI Core", "author": "EPAM", "license": "MIT", diff --git a/uui-db/package.json b/uui-db/package.json index 75f652ab64..ef6680bac2 100644 --- a/uui-db/package.json +++ b/uui-db/package.json @@ -1,6 +1,6 @@ { "name": "@epam/uui-db", - "version": "6.4.3", + "version": "6.4.4", "description": "UUI - client-side relational state cache", "author": "EPAM", "license": "MIT", @@ -14,7 +14,7 @@ "prepublish": "yarn build" }, "dependencies": { - "@epam/uui-core": "6.4.3", + "@epam/uui-core": "6.4.4", "@types/lodash.countby": "4.6.6", "@types/lodash.filter": "4.6.6", "@types/lodash.foreach": "4.5.6", diff --git a/uui-docs/package.json b/uui-docs/package.json index 76610f7ac2..9a76d3c88b 100644 --- a/uui-docs/package.json +++ b/uui-docs/package.json @@ -1,6 +1,6 @@ { "name": "@epam/uui-docs", - "version": "6.4.3", + "version": "6.4.4", "description": "EPAM UUI Documentation infrastructure", "author": "EPAM", "license": "MIT", @@ -12,12 +12,12 @@ "prepublish": "yarn build" }, "dependencies": { - "@epam/assets": "6.4.3", - "@epam/loveship": "6.4.3", - "@epam/promo": "6.4.3", - "@epam/uui": "6.4.3", - "@epam/uui-components": "6.4.3", - "@epam/uui-core": "6.4.3", + "@epam/assets": "6.4.4", + "@epam/loveship": "6.4.4", + "@epam/promo": "6.4.4", + "@epam/uui": "6.4.4", + "@epam/uui-components": "6.4.4", + "@epam/uui-core": "6.4.4", "@types/classnames": "2.2.6", "classnames": "^2.2.6" }, diff --git a/uui-e2e-tests/package.json b/uui-e2e-tests/package.json index 45a072e82e..f51ca68c71 100644 --- a/uui-e2e-tests/package.json +++ b/uui-e2e-tests/package.json @@ -1,6 +1,6 @@ { "name": "@epam/uui-e2e-tests", - "version": "6.4.3", + "version": "6.4.4", "description": "", "author": "EPAM", "license": "MIT", @@ -23,8 +23,8 @@ "print-error": "ts-node scripts/cmd/cmdPrintError.ts" }, "dependencies": { - "@epam/uui-core": "6.4.3", - "@epam/uui-docs": "6.4.3", + "@epam/uui-core": "6.4.4", + "@epam/uui-docs": "6.4.4", "@playwright/test": "1.57.0", "@types/node": "*", "address": "2.0.2", diff --git a/uui-editor/package.json b/uui-editor/package.json index 168a6d3fe3..d41c67c2db 100644 --- a/uui-editor/package.json +++ b/uui-editor/package.json @@ -1,6 +1,6 @@ { "name": "@epam/uui-editor", - "version": "6.4.3", + "version": "6.4.4", "author": "EPAM", "license": "MIT", "main": "index.js", @@ -12,10 +12,10 @@ }, "dependencies": { "@braintree/sanitize-url": "7.0.0", - "@epam/assets": "6.4.3", - "@epam/uui": "6.4.3", - "@epam/uui-components": "6.4.3", - "@epam/uui-core": "6.4.3", + "@epam/assets": "6.4.4", + "@epam/uui": "6.4.4", + "@epam/uui-components": "6.4.4", + "@epam/uui-core": "6.4.4", "@floating-ui/react": "0.27.5", "@udecode/plate-autoformat": "31.0.0", "@udecode/plate-basic-marks": "31.0.0", diff --git a/uui-timeline/package.json b/uui-timeline/package.json index 2459095571..aace3be6a8 100644 --- a/uui-timeline/package.json +++ b/uui-timeline/package.json @@ -1,6 +1,6 @@ { "name": "@epam/uui-timeline", - "version": "6.4.3", + "version": "6.4.4", "author": "EPAM", "license": "MIT", "main": "index.js", @@ -11,8 +11,8 @@ "prepublish": "yarn build" }, "dependencies": { - "@epam/uui-components": "6.4.3", - "@epam/uui-core": "6.4.3", + "@epam/uui-components": "6.4.4", + "@epam/uui-core": "6.4.4", "@types/lodash.sortedindex": "^4.1.9", "classnames": "^2.2.6", "lodash.sortedindex": "^4.1.0" diff --git a/uui/package.json b/uui/package.json index 4d32427d31..054c0d06b1 100644 --- a/uui/package.json +++ b/uui/package.json @@ -1,6 +1,6 @@ { "name": "@epam/uui", - "version": "6.4.3", + "version": "6.4.4", "description": "EPAM UUI components set", "author": "EPAM", "license": "MIT", @@ -12,9 +12,9 @@ "prepublish": "yarn build" }, "dependencies": { - "@epam/assets": "6.4.3", - "@epam/uui-components": "6.4.3", - "@epam/uui-core": "6.4.3", + "@epam/assets": "6.4.4", + "@epam/uui-components": "6.4.4", + "@epam/uui-core": "6.4.4", "@floating-ui/react": "0.27.5", "classnames": "2.2.6", "dayjs": "1.11.12",