Skip to content

Commit

Permalink
release: 4.24.1 to main (#20249)
Browse files Browse the repository at this point in the history
* fix(content-manager): bulk publish would only ever show first entry to be published (#20234)

* fix(content-manager): Fix bulk publish selection

* chore: refactor & simplify bulk publish

---------

Co-authored-by: Josh <[email protected]>

* fix(admin): if were in EE mode wait for the EE routes to be loaded before rendering (#20238)

* fix: issue 20138 (#20240)

* v4.24.1

---------

Co-authored-by: Fernando Ch谩vez <[email protected]>
Co-authored-by: Josh <[email protected]>
Co-authored-by: Alexandre BODIN <[email protected]>
  • Loading branch information
4 people committed May 2, 2024
1 parent 8d03eef commit f78d33c
Show file tree
Hide file tree
Showing 52 changed files with 635 additions and 447 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": "4.24.0",
"version": "4.24.1",
"private": true,
"license": "MIT",
"main": "dist/index.js",
Expand Down
22 changes: 11 additions & 11 deletions examples/getstarted/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "getstarted",
"version": "4.24.0",
"version": "4.24.1",
"private": true,
"description": "A Strapi application.",
"license": "SEE LICENSE IN LICENSE",
Expand All @@ -14,16 +14,16 @@
},
"dependencies": {
"@strapi/icons": "1.18.0",
"@strapi/plugin-color-picker": "4.24.0",
"@strapi/plugin-documentation": "4.24.0",
"@strapi/plugin-graphql": "4.24.0",
"@strapi/plugin-i18n": "4.24.0",
"@strapi/plugin-sentry": "4.24.0",
"@strapi/plugin-users-permissions": "4.24.0",
"@strapi/provider-email-mailgun": "4.24.0",
"@strapi/provider-upload-aws-s3": "4.24.0",
"@strapi/provider-upload-cloudinary": "4.24.0",
"@strapi/strapi": "4.24.0",
"@strapi/plugin-color-picker": "4.24.1",
"@strapi/plugin-documentation": "4.24.1",
"@strapi/plugin-graphql": "4.24.1",
"@strapi/plugin-i18n": "4.24.1",
"@strapi/plugin-sentry": "4.24.1",
"@strapi/plugin-users-permissions": "4.24.1",
"@strapi/provider-email-mailgun": "4.24.1",
"@strapi/provider-upload-aws-s3": "4.24.1",
"@strapi/provider-upload-cloudinary": "4.24.1",
"@strapi/strapi": "4.24.1",
"better-sqlite3": "8.6.0",
"lodash": "4.17.21",
"mysql": "2.18.1",
Expand Down
8 changes: 4 additions & 4 deletions examples/kitchensink-ts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kitchensink-ts",
"version": "4.24.0",
"version": "4.24.1",
"private": true,
"description": "A Strapi application",
"license": "MIT",
Expand All @@ -14,9 +14,9 @@
"strapi": "strapi"
},
"dependencies": {
"@strapi/plugin-i18n": "4.24.0",
"@strapi/plugin-users-permissions": "4.24.0",
"@strapi/strapi": "4.24.0",
"@strapi/plugin-i18n": "4.24.1",
"@strapi/plugin-users-permissions": "4.24.1",
"@strapi/strapi": "4.24.1",
"better-sqlite3": "8.6.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
10 changes: 5 additions & 5 deletions examples/kitchensink/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kitchensink",
"version": "4.24.0",
"version": "4.24.1",
"private": true,
"description": "A Strapi application.",
"license": "SEE LICENSE IN LICENSE",
Expand All @@ -13,10 +13,10 @@
"strapi": "strapi"
},
"dependencies": {
"@strapi/provider-email-mailgun": "4.24.0",
"@strapi/provider-upload-aws-s3": "4.24.0",
"@strapi/provider-upload-cloudinary": "4.24.0",
"@strapi/strapi": "4.24.0",
"@strapi/provider-email-mailgun": "4.24.1",
"@strapi/provider-upload-aws-s3": "4.24.1",
"@strapi/provider-upload-cloudinary": "4.24.1",
"@strapi/strapi": "4.24.1",
"lodash": "4.17.21",
"mysql": "2.18.1",
"mysql2": "3.9.4",
Expand Down
2 changes: 1 addition & 1 deletion examples/plugins/workspace-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-plugin-workspace-plugin",
"version": "4.24.0",
"version": "4.24.1",
"private": true,
"description": "This is the description of my plugin.",
"exports": {
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "4.24.0",
"version": "4.24.1",
"packages": ["packages/*", "examples/*"],
"npmClient": "yarn",
"useWorkspaces": true,
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": "4.24.0",
"version": "4.24.1",
"private": true,
"description": "Test utilities for the Strapi administration panel",
"license": "MIT",
Expand Down Expand Up @@ -74,8 +74,8 @@
"@reduxjs/toolkit": "1.9.7",
"@strapi/pack-up": "4.23.0",
"@testing-library/jest-dom": "5.16.5",
"eslint-config-custom": "4.24.0",
"tsconfig": "4.24.0"
"eslint-config-custom": "4.24.1",
"tsconfig": "4.24.1"
},
"peerDependencies": {
"@reduxjs/toolkit": "^1.9.7",
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": "4.24.0",
"version": "4.24.1",
"description": "Generate a new Strapi application.",
"keywords": [
"create-strapi-app",
Expand Down Expand Up @@ -43,14 +43,14 @@
"watch": "pack-up watch"
},
"dependencies": {
"@strapi/generate-new": "4.24.0",
"@strapi/generate-new": "4.24.1",
"commander": "8.3.0",
"inquirer": "8.2.5"
},
"devDependencies": {
"@strapi/pack-up": "4.23.0",
"eslint-config-custom": "4.24.0",
"tsconfig": "4.24.0"
"eslint-config-custom": "4.24.1",
"tsconfig": "4.24.1"
},
"engines": {
"node": ">=18.0.0 <=20.x.x",
Expand Down
8 changes: 4 additions & 4 deletions packages/cli/create-strapi-starter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-strapi-starter",
"version": "4.24.0",
"version": "4.24.1",
"description": "Generate a new Strapi application.",
"keywords": [
"create-strapi-starter",
Expand Down Expand Up @@ -43,7 +43,7 @@
"watch": "pack-up watch"
},
"dependencies": {
"@strapi/generate-new": "4.24.0",
"@strapi/generate-new": "4.24.1",
"chalk": "4.1.2",
"ci-info": "3.8.0",
"commander": "8.3.0",
Expand All @@ -54,8 +54,8 @@
},
"devDependencies": {
"@strapi/pack-up": "4.23.0",
"eslint-config-custom": "4.24.0",
"tsconfig": "4.24.0"
"eslint-config-custom": "4.24.1",
"tsconfig": "4.24.1"
},
"engines": {
"node": ">=18.0.0 <=20.x.x",
Expand Down
8 changes: 7 additions & 1 deletion packages/core/admin/admin/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,13 @@ export const App = ({ authLogo, menuLogo, showReleaseNotification, showTutorials
[uuid, telemetryPropertiesQuery.data]
);

if (initQuery.isLoading) {
/**
* `routes` will only be an array if EE mode is activated,
* therefore we need to ensure the lazy loading of EE routes
* has been complete otherwise the SSO repsonse URL will not be
* caught by the component and you won't be able to login with it.
*/
if (initQuery.isLoading || (Array.isArray(routes) && routes.length === 0)) {
return <LoadingIndicatorPage />;
}

Expand Down

0 comments on commit f78d33c

Please sign in to comment.