Skip to content

sync develop after release #3079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MSt1ch merged 8 commits into from
Apr 1, 2026
Merged

sync develop after release #3079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7c0cbe6
Merge pull request #3041 from epam/develop
MSt1ch Feb 20, 2026
84cec19
fix: fix api loading on codesandbox examples (#3072)
JuliaMV Mar 26, 2026
7453401
Revert "fix: fix api loading on codesandbox examples (#3072)"
JuliaMV Mar 27, 2026
ae4b439
Merge pull request #3075 from epam/revert-3072-fix/codesandbox-api-ac…
JuliaMV Mar 27, 2026
f7f5007
fix: add .csb.app to CSP
JuliaMV Mar 27, 2026
77b011a
fix: fix api calls on sandbox pages (#3076)
JuliaMV Mar 27, 2026
ea1aff3
Merge pull request #3078 from epam/develop
JuliaMV Apr 1, 2026
f6da977
v6.4.4
JuliaMV Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/app",
"version": "6.4.3",
"version": "6.4.4",
"description": "EPAM Unified UI landing",
"author": "EPAM",
"license": "MIT",
Expand All @@ -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",
Expand Down
9 changes: 7 additions & 2 deletions app/src/data/apiDefinition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion epam-assets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/assets",
"version": "6.4.3",
"version": "6.4.4",
"description": "EPAM Assets Library",
"author": "EPAM",
"license": "MIT",
Expand Down
8 changes: 4 additions & 4 deletions epam-electric/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions epam-promo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/promo",
"version": "6.4.3",
"version": "6.4.4",
"description": "EPAM UUI4 components set",
"author": "EPAM",
"license": "MIT",
Expand All @@ -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"
},
Expand Down
8 changes: 4 additions & 4 deletions extra/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "6.4.3",
"version": "6.4.4",
"npmClient": "yarn",
"useWorkspaces": true,
"exact": true
Expand Down
10 changes: 5 additions & 5 deletions loveship/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
},
Expand Down
1 change: 1 addition & 0 deletions server/utils/cspUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion templates/uui-cra-template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/cra-template-uui",
"version": "6.4.3",
"version": "6.4.4",
"keywords": [
"UUI",
"react",
Expand Down
4 changes: 2 additions & 2 deletions test-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-test-utils",
"version": "6.4.3",
"version": "6.4.4",
"author": "EPAM",
"license": "MIT",
"private": false,
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion uui-build/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-build",
"version": "6.4.3",
"version": "6.4.4",
"bin": {
"epam-uui-build": "./bin/cli.js"
},
Expand Down
4 changes: 2 additions & 2 deletions uui-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-components",
"version": "6.4.3",
"version": "6.4.4",
"description": "EPAM UUI Components",
"author": "EPAM",
"license": "MIT",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion uui-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-core",
"version": "6.4.3",
"version": "6.4.4",
"description": "EPAM UUI Core",
"author": "EPAM",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions uui-db/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions uui-docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
},
Expand Down
6 changes: 3 additions & 3 deletions uui-e2e-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-e2e-tests",
"version": "6.4.3",
"version": "6.4.4",
"description": "",
"author": "EPAM",
"license": "MIT",
Expand All @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions uui-editor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-editor",
"version": "6.4.3",
"version": "6.4.4",
"author": "EPAM",
"license": "MIT",
"main": "index.js",
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions uui-timeline/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui-timeline",
"version": "6.4.3",
"version": "6.4.4",
"author": "EPAM",
"license": "MIT",
"main": "index.js",
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions uui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@epam/uui",
"version": "6.4.3",
"version": "6.4.4",
"description": "EPAM UUI components set",
"author": "EPAM",
"license": "MIT",
Expand All @@ -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",
Expand Down
Loading