Skip to content

Commit

Permalink
chore: backmerge main into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Convly authored Feb 28, 2025
2 parents e98ae27 + 758d0cf commit 6d1dbc9
Show file tree
Hide file tree
Showing 43 changed files with 353 additions and 353 deletions.
2 changes: 1 addition & 1 deletion .github/actions/check-pr-status/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "check-pr-status",
"version": "5.10.3",
"version": "5.10.4",
"private": true,
"license": "MIT",
"main": "dist/index.js",
Expand Down
6 changes: 3 additions & 3 deletions packages/admin-test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@strapi/admin-test-utils",
"version": "5.10.3",
"version": "5.10.4",
"private": true,
"description": "Test utilities for the Strapi administration panel",
"license": "MIT",
Expand Down Expand Up @@ -84,10 +84,10 @@
"devDependencies": {
"@reduxjs/toolkit": "1.9.7",
"@testing-library/jest-dom": "6.4.5",
"eslint-config-custom": "5.10.3",
"eslint-config-custom": "5.10.4",
"jest-environment-jsdom": "29.6.1",
"styled-components": "6.1.8",
"tsconfig": "5.10.3"
"tsconfig": "5.10.4"
},
"peerDependencies": {
"@reduxjs/toolkit": "^1.9.7",
Expand Down
8 changes: 4 additions & 4 deletions packages/cli/cloud/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@strapi/cloud-cli",
"version": "5.10.3",
"version": "5.10.4",
"description": "Commands to interact with the Strapi Cloud",
"keywords": [
"strapi",
Expand Down Expand Up @@ -47,7 +47,7 @@
"watch": "run -T rollup -c -w"
},
"dependencies": {
"@strapi/utils": "5.10.3",
"@strapi/utils": "5.10.4",
"axios": "1.7.4",
"boxen": "5.1.2",
"chalk": "4.1.2",
Expand All @@ -72,8 +72,8 @@
"@types/cli-progress": "3.11.5",
"@types/eventsource": "1.1.15",
"@types/lodash": "^4.14.191",
"eslint-config-custom": "5.10.3",
"tsconfig": "5.10.3"
"eslint-config-custom": "5.10.4",
"tsconfig": "5.10.4"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",
Expand Down
8 changes: 4 additions & 4 deletions packages/cli/create-strapi-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-strapi-app",
"version": "5.10.3",
"version": "5.10.4",
"description": "Generate a new Strapi application.",
"keywords": [
"create-strapi-app",
Expand Down Expand Up @@ -50,7 +50,7 @@
"watch": "run -T rollup -c -w"
},
"dependencies": {
"@strapi/cloud-cli": "5.10.3",
"@strapi/cloud-cli": "5.10.4",
"async-retry": "1.3.3",
"chalk": "4.1.2",
"commander": "8.3.0",
Expand All @@ -69,8 +69,8 @@
"@types/async-retry": "^1",
"@types/fs-extra": "11.0.4",
"@types/inquirer": "8.2.5",
"eslint-config-custom": "5.10.3",
"tsconfig": "5.10.3"
"eslint-config-custom": "5.10.4",
"tsconfig": "5.10.4"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/create-strapi/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-strapi",
"version": "5.10.3",
"version": "5.10.4",
"description": "Generate a new Strapi application.",
"keywords": [
"create-strapi",
Expand Down Expand Up @@ -36,7 +36,7 @@
"bin/"
],
"dependencies": {
"create-strapi-app": "5.10.3"
"create-strapi-app": "5.10.4"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",
Expand Down
14 changes: 7 additions & 7 deletions packages/core/admin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@strapi/admin",
"version": "5.10.3",
"version": "5.10.4",
"description": "Strapi Admin",
"repository": {
"type": "git",
Expand Down Expand Up @@ -86,10 +86,10 @@
"@reduxjs/toolkit": "1.9.7",
"@strapi/design-system": "2.0.0-rc.18",
"@strapi/icons": "2.0.0-rc.18",
"@strapi/permissions": "5.10.3",
"@strapi/types": "5.10.3",
"@strapi/typescript-utils": "5.10.3",
"@strapi/utils": "5.10.3",
"@strapi/permissions": "5.10.4",
"@strapi/types": "5.10.4",
"@strapi/typescript-utils": "5.10.4",
"@strapi/utils": "5.10.4",
"@testing-library/dom": "10.1.0",
"@testing-library/react": "15.0.7",
"@testing-library/user-event": "14.5.2",
Expand Down Expand Up @@ -143,8 +143,8 @@
"zod": "^3.22.4"
},
"devDependencies": {
"@strapi/admin-test-utils": "5.10.3",
"@strapi/data-transfer": "5.10.3",
"@strapi/admin-test-utils": "5.10.4",
"@strapi/data-transfer": "5.10.4",
"@types/codemirror5": "npm:@types/codemirror@^5.60.15",
"@types/fs-extra": "11.0.4",
"@types/invariant": "2.2.36",
Expand Down
10 changes: 5 additions & 5 deletions packages/core/content-manager/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@strapi/content-manager",
"version": "5.10.3",
"version": "5.10.4",
"description": "A powerful UI to easily manage your data.",
"repository": {
"type": "git",
Expand Down Expand Up @@ -66,8 +66,8 @@
"@sindresorhus/slugify": "1.1.0",
"@strapi/design-system": "2.0.0-rc.18",
"@strapi/icons": "2.0.0-rc.18",
"@strapi/types": "5.10.3",
"@strapi/utils": "5.10.3",
"@strapi/types": "5.10.4",
"@strapi/utils": "5.10.4",
"codemirror5": "npm:codemirror@^5.65.11",
"date-fns": "2.30.0",
"fractional-indexing": "3.2.0",
Expand Down Expand Up @@ -102,8 +102,8 @@
"yup": "0.32.9"
},
"devDependencies": {
"@strapi/admin": "5.10.3",
"@strapi/database": "5.10.3",
"@strapi/admin": "5.10.4",
"@strapi/database": "5.10.4",
"@testing-library/react": "15.0.7",
"@types/jest": "29.5.2",
"@types/lodash": "^4.14.191",
Expand Down
14 changes: 7 additions & 7 deletions packages/core/content-releases/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@strapi/content-releases",
"version": "5.10.3",
"version": "5.10.4",
"description": "Strapi plugin for organizing and releasing content",
"repository": {
"type": "git",
Expand Down Expand Up @@ -59,11 +59,11 @@
},
"dependencies": {
"@reduxjs/toolkit": "1.9.7",
"@strapi/database": "5.10.3",
"@strapi/database": "5.10.4",
"@strapi/design-system": "2.0.0-rc.18",
"@strapi/icons": "2.0.0-rc.18",
"@strapi/types": "5.10.3",
"@strapi/utils": "5.10.3",
"@strapi/types": "5.10.4",
"@strapi/utils": "5.10.4",
"date-fns": "2.30.0",
"date-fns-tz": "2.0.1",
"formik": "2.4.5",
Expand All @@ -75,9 +75,9 @@
"yup": "0.32.9"
},
"devDependencies": {
"@strapi/admin": "5.10.3",
"@strapi/admin-test-utils": "5.10.3",
"@strapi/content-manager": "5.10.3",
"@strapi/admin": "5.10.4",
"@strapi/admin-test-utils": "5.10.4",
"@strapi/content-manager": "5.10.4",
"@testing-library/dom": "10.1.0",
"@testing-library/react": "15.0.7",
"@testing-library/user-event": "14.5.2",
Expand Down
10 changes: 5 additions & 5 deletions packages/core/content-type-builder/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@strapi/content-type-builder",
"version": "5.10.3",
"version": "5.10.4",
"description": "Create and manage content types",
"repository": {
"type": "git",
Expand Down Expand Up @@ -63,9 +63,9 @@
"@reduxjs/toolkit": "1.9.7",
"@sindresorhus/slugify": "1.1.0",
"@strapi/design-system": "2.0.0-rc.18",
"@strapi/generators": "5.10.3",
"@strapi/generators": "5.10.4",
"@strapi/icons": "2.0.0-rc.18",
"@strapi/utils": "5.10.3",
"@strapi/utils": "5.10.4",
"date-fns": "2.30.0",
"fs-extra": "11.2.0",
"immer": "9.0.21",
Expand All @@ -77,8 +77,8 @@
"yup": "0.32.9"
},
"devDependencies": {
"@strapi/admin": "5.10.3",
"@strapi/types": "5.10.3",
"@strapi/admin": "5.10.4",
"@strapi/types": "5.10.4",
"@testing-library/dom": "10.1.0",
"@testing-library/react": "15.0.7",
"@testing-library/user-event": "14.5.2",
Expand Down
22 changes: 11 additions & 11 deletions packages/core/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@strapi/core",
"version": "5.10.3",
"version": "5.10.4",
"description": "Core of Strapi",
"homepage": "https://strapi.io",
"bugs": {
Expand Down Expand Up @@ -56,14 +56,14 @@
"@koa/cors": "5.0.0",
"@koa/router": "12.0.2",
"@paralleldrive/cuid2": "2.2.2",
"@strapi/admin": "5.10.3",
"@strapi/database": "5.10.3",
"@strapi/generators": "5.10.3",
"@strapi/logger": "5.10.3",
"@strapi/permissions": "5.10.3",
"@strapi/types": "5.10.3",
"@strapi/typescript-utils": "5.10.3",
"@strapi/utils": "5.10.3",
"@strapi/admin": "5.10.4",
"@strapi/database": "5.10.4",
"@strapi/generators": "5.10.4",
"@strapi/logger": "5.10.4",
"@strapi/permissions": "5.10.4",
"@strapi/types": "5.10.4",
"@strapi/typescript-utils": "5.10.4",
"@strapi/utils": "5.10.4",
"bcryptjs": "2.4.3",
"boxen": "5.1.2",
"chalk": "4.1.2",
Expand Down Expand Up @@ -126,9 +126,9 @@
"@types/node": "18.19.24",
"@types/node-schedule": "2.1.7",
"@types/statuses": "2.0.1",
"eslint-config-custom": "5.10.3",
"eslint-config-custom": "5.10.4",
"supertest": "6.3.3",
"tsconfig": "5.10.3"
"tsconfig": "5.10.4"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",
Expand Down
10 changes: 5 additions & 5 deletions packages/core/data-transfer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@strapi/data-transfer",
"version": "5.10.3",
"version": "5.10.4",
"description": "Data transfer capabilities for Strapi",
"keywords": [
"strapi",
Expand Down Expand Up @@ -42,9 +42,9 @@
"watch": "run -T rollup -c -w"
},
"dependencies": {
"@strapi/logger": "5.10.3",
"@strapi/types": "5.10.3",
"@strapi/utils": "5.10.3",
"@strapi/logger": "5.10.4",
"@strapi/types": "5.10.4",
"@strapi/utils": "5.10.4",
"chalk": "4.1.2",
"cli-table3": "0.6.5",
"commander": "8.3.0",
Expand All @@ -61,7 +61,7 @@
"ws": "8.17.1"
},
"devDependencies": {
"@strapi/database": "5.10.3",
"@strapi/database": "5.10.4",
"@types/fs-extra": "11.0.4",
"@types/jest": "29.5.2",
"@types/koa": "2.13.4",
Expand Down
8 changes: 4 additions & 4 deletions packages/core/database/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@strapi/database",
"version": "5.10.3",
"version": "5.10.4",
"description": "Strapi's database layer",
"homepage": "https://strapi.io",
"bugs": {
Expand Down Expand Up @@ -42,7 +42,7 @@
},
"dependencies": {
"@paralleldrive/cuid2": "2.2.2",
"@strapi/utils": "5.10.3",
"@strapi/utils": "5.10.4",
"ajv": "8.16.0",
"date-fns": "2.30.0",
"debug": "4.3.4",
Expand All @@ -54,8 +54,8 @@
},
"devDependencies": {
"@types/fs-extra": "11.0.4",
"eslint-config-custom": "5.10.3",
"tsconfig": "5.10.3"
"eslint-config-custom": "5.10.4",
"tsconfig": "5.10.4"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",
Expand Down
10 changes: 5 additions & 5 deletions packages/core/email/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@strapi/email",
"version": "5.10.3",
"version": "5.10.4",
"description": "Easily configure your Strapi application to send emails.",
"repository": {
"type": "git",
Expand Down Expand Up @@ -58,17 +58,17 @@
"dependencies": {
"@strapi/design-system": "2.0.0-rc.18",
"@strapi/icons": "2.0.0-rc.18",
"@strapi/provider-email-sendmail": "5.10.3",
"@strapi/utils": "5.10.3",
"@strapi/provider-email-sendmail": "5.10.4",
"@strapi/utils": "5.10.4",
"koa2-ratelimit": "^1.1.3",
"lodash": "4.17.21",
"react-intl": "6.6.2",
"react-query": "3.39.3",
"yup": "0.32.9"
},
"devDependencies": {
"@strapi/admin": "5.10.3",
"@strapi/types": "5.10.3",
"@strapi/admin": "5.10.4",
"@strapi/types": "5.10.4",
"@testing-library/react": "15.0.7",
"@types/koa": "2.13.4",
"@types/lodash": "^4.14.191",
Expand Down
8 changes: 4 additions & 4 deletions packages/core/permissions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@strapi/permissions",
"version": "5.10.3",
"version": "5.10.4",
"description": "Strapi's permission layer.",
"repository": {
"type": "git",
Expand Down Expand Up @@ -39,14 +39,14 @@
},
"dependencies": {
"@casl/ability": "6.5.0",
"@strapi/utils": "5.10.3",
"@strapi/utils": "5.10.4",
"lodash": "4.17.21",
"qs": "6.11.1",
"sift": "16.0.1"
},
"devDependencies": {
"eslint-config-custom": "5.10.3",
"tsconfig": "5.10.3"
"eslint-config-custom": "5.10.4",
"tsconfig": "5.10.4"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",
Expand Down
Loading

0 comments on commit 6d1dbc9

Please sign in to comment.