Merge branch 'v5/main' into v5/remove-root-level-nested-params

.github/actions/check-pr-status/package.json

@@ -1,6 +1,6 @@
 {
   "name": "check-pr-status",
-  "version": "5.0.0-beta.6",
+  "version": "5.0.0-beta.7",
   "private": true,
   "license": "MIT",
   "main": "dist/index.js",

.github/workflows/caniuse.yml

@@ -0,0 +1,33 @@
+name: Update Browserslist database
+
+on:
+  schedule:
+    # runs twice a month, day 1 & day 15.
+    - cron: '0 2 1,15 * *'
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  update-browserslist-database:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Configure git
+        run: |
+          git config --global user.email "action@github.com"
+          git config --global user.name "GitHub Action"
+      - name: Update Browserslist database and create PR if applies
+        uses: c2corg/browserslist-update-action@v2
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: browserslist-update
+          base_branch: main
+          commit_message: 'chore(deps): update Browserslist db'
+          title: 'chore(deps): update Browserslist db'
+          labels: 'pr: chore, source: dependencies'
+          reviewers: 'joshuaellis,simotae14,madhurisandbhor'

.github/workflows/tests.yml

@@ -188,7 +188,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: ce-playwright-trace
+          name: ce-${{ matrix.project }}--playwright-trace
           path: test-apps/e2e/test-results/**/trace.zip
           retention-days: 1
 
@@ -231,7 +231,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: ee-playwright-trace
+          name: ee-${{ matrix.project }}--playwright-trace
           path: test-apps/e2e/test-results/**/trace.zip
           retention-days: 1
 

.gitignore

@@ -108,6 +108,8 @@ packages/generators/app/files/public/
 schema.graphql
 dist
 .nx
+.tsbuildinfo
+.eslintcache
 
 ############################
 # Example app
@@ -126,15 +128,19 @@ front-workspace.code-workspace
 .yarnrc
 
 ############################
-# Yarn
+# Package managers
 ############################
+
 .pnp.*
 .yarn/*
 !.yarn/patches
 !.yarn/plugins
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
+yarn-error.log
+pnpm-debug.log
+npm-debug.log
 
 ############################
 # Playwright

docs/docs/docs/01-core/content-manager/hooks/use-drag-and-drop.mdx

@@ -53,11 +53,11 @@ const MyComponent = ({ onMoveItem }) => {
       ) : (
         <Flex ref={composedRefs} data-handler-id={handlerId}>
           <IconButton
-            forwardedAs="div"
+            tag="div"
             role="button"
             tabIndex={0}
             aria-label="Drag"
-            noBorder
+            borderWidth={0}
             onKeyDown={handleKeyDown}
           >
             <Drag />
@@ -99,11 +99,11 @@ const MyComponent = ({ onDropItem }) => {
       {isOverDropTarget && <Placeholder direction={direction} />}
       <Flex ref={composedRefs} data-handler-id={handlerId}>
         <IconButton
-          forwardedAs="div"
+          tag="div"
           role="button"
           tabIndex={0}
           aria-label="Drag"
-          noBorder
+          borderWidth={0}
           onKeyDown={handleKeyDown}
         >
           <Drag />
@@ -153,11 +153,11 @@ const MyComponent = ({ onMoveItem }) => {
       ) : (
         <Flex ref={composedRefs} data-handler-id={handlerId}>
           <IconButton
-            forwardedAs="div"
+            tag="div"
             role="button"
             tabIndex={0}
             aria-label="Drag"
-            noBorder
+            borderWidth={0}
             onKeyDown={handleKeyDown}
           >
             <Drag />
@@ -252,11 +252,11 @@ You might notice in the [basic usage](#basic-usage) section this piece of code:
 
 ```jsx
 <IconButton
-  forwardedAs="div"
+  tag="div"
   role="button"
   tabIndex={0}
   aria-label="Drag"
-  noBorder
+  borderWidth={0}
   onKeyDown={handleKeyDown}
 >
   <Drag />

docs/package.json

@@ -33,8 +33,8 @@
     "@mdx-js/react": "^3.0.0",
     "clsx": "^1.1.1",
     "prism-react-renderer": "^2.1.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react": "18.3.0",
+    "react-dom": "18.3.0"
   },
   "devDependencies": {
     "@docusaurus/module-type-aliases": "3.1.1",

examples/getstarted/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getstarted",
-  "version": "5.0.0-beta.6",
+  "version": "5.0.0-beta.7",
   "private": true,
   "description": "A Strapi application.",
   "license": "SEE LICENSE IN LICENSE",
@@ -13,27 +13,27 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@strapi/icons": "2.0.0-beta.2",
-    "@strapi/plugin-color-picker": "5.0.0-beta.6",
-    "@strapi/plugin-documentation": "5.0.0-beta.6",
-    "@strapi/plugin-graphql": "5.0.0-beta.6",
-    "@strapi/plugin-sentry": "5.0.0-beta.6",
-    "@strapi/plugin-users-permissions": "5.0.0-beta.6",
-    "@strapi/provider-email-mailgun": "5.0.0-beta.6",
-    "@strapi/provider-upload-aws-s3": "5.0.0-beta.6",
-    "@strapi/provider-upload-cloudinary": "5.0.0-beta.6",
-    "@strapi/strapi": "5.0.0-beta.6",
+    "@strapi/icons": "2.0.0-beta.4",
+    "@strapi/plugin-color-picker": "5.0.0-beta.7",
+    "@strapi/plugin-documentation": "5.0.0-beta.7",
+    "@strapi/plugin-graphql": "5.0.0-beta.7",
+    "@strapi/plugin-sentry": "5.0.0-beta.7",
+    "@strapi/plugin-users-permissions": "5.0.0-beta.7",
+    "@strapi/provider-email-mailgun": "5.0.0-beta.7",
+    "@strapi/provider-upload-aws-s3": "5.0.0-beta.7",
+    "@strapi/provider-upload-cloudinary": "5.0.0-beta.7",
+    "@strapi/strapi": "5.0.0-beta.7",
     "better-sqlite3": "9.4.3",
     "lodash": "4.17.21",
     "mysql2": "3.6.2",
     "passport-google-oauth2": "0.2.0",
     "pg": "8.11.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-intl": "6.6.2",
     "react-router-dom": "6.22.3",
     "strapi-plugin-workspace-plugin": "workspace:*",
-    "styled-components": "5.3.11"
+    "styled-components": "6.1.8"
   },
   "engines": {
     "node": ">=18.0.0 <=20.x.x",

examples/getstarted/src/plugins/local-plugin/admin/src/index.js

@@ -1,5 +1,6 @@
+import { PuzzlePiece } from '@strapi/icons';
+
 import { prefixPluginTranslations } from './utils/prefixPluginTranslations';
-import PluginIcon from './components/PluginIcon';
 import pluginPkg from '../../package.json';
 import pluginId from './pluginId';
 
@@ -9,7 +10,7 @@ export default {
   register(app) {
     app.addMenuLink({
       to: `plugins/${pluginId}`,
-      icon: PluginIcon,
+      icon: PuzzlePiece,
       intlLabel: {
         id: `${pluginId}.plugin.name`,
         defaultMessage: 'My plugin',
@@ -57,7 +58,7 @@ export default {
           defaultMessage: `custom${upcasedType}`,
         },
         components: {
-          Input: async () => import('./components/PluginIcon'),
+          Input: PuzzlePiece,
         },
       };
 

examples/kitchensink-ts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchensink-ts",
-  "version": "5.0.0-beta.6",
+  "version": "5.0.0-beta.7",
   "private": true,
   "description": "A Strapi application",
   "license": "MIT",
@@ -14,13 +14,13 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@strapi/plugin-users-permissions": "5.0.0-beta.6",
-    "@strapi/strapi": "5.0.0-beta.6",
+    "@strapi/plugin-users-permissions": "5.0.0-beta.7",
+    "@strapi/strapi": "5.0.0-beta.7",
     "better-sqlite3": "9.4.3",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-router-dom": "6.22.3",
-    "styled-components": "5.3.11"
+    "styled-components": "6.1.8"
   },
   "engines": {
     "node": ">=18.0.0 <=20.x.x",

examples/kitchensink/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchensink",
-  "version": "5.0.0-beta.6",
+  "version": "5.0.0-beta.7",
   "private": true,
   "description": "A Strapi application.",
   "license": "SEE LICENSE IN LICENSE",
@@ -13,19 +13,19 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@strapi/provider-email-mailgun": "5.0.0-beta.6",
-    "@strapi/provider-upload-aws-s3": "5.0.0-beta.6",
-    "@strapi/provider-upload-cloudinary": "5.0.0-beta.6",
-    "@strapi/strapi": "5.0.0-beta.6",
+    "@strapi/provider-email-mailgun": "5.0.0-beta.7",
+    "@strapi/provider-upload-aws-s3": "5.0.0-beta.7",
+    "@strapi/provider-upload-cloudinary": "5.0.0-beta.7",
+    "@strapi/strapi": "5.0.0-beta.7",
     "better-sqlite3": "9.4.3",
     "lodash": "4.17.21",
     "mysql2": "3.6.2",
     "passport-google-oauth2": "0.2.0",
     "pg": "8.11.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-router-dom": "6.22.3",
-    "styled-components": "5.3.11"
+    "styled-components": "6.1.8"
   },
   "engines": {
     "node": ">=18.0.0 <=20.x.x",

examples/plugins/workspace-plugin/admin/src/index.js

@@ -1,4 +1,5 @@
-import PluginIcon from './components/PluginIcon';
+import { PuzzlePiece } from '@strapi/icons';
+
 import pluginPkg from '../../package.json';
 import pluginId from './pluginId';
 
@@ -8,7 +9,7 @@ export default {
   register(app) {
     app.addMenuLink({
       to: `/plugins/${pluginId}`,
-      icon: PluginIcon,
+      icon: PuzzlePiece,
       intlLabel: {
         id: `${pluginId}.plugin.name`,
         defaultMessage: 'My plugin',

examples/plugins/workspace-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-workspace-plugin",
-  "version": "5.0.0-beta.6",
+  "version": "5.0.0-beta.7",
   "private": true,
   "description": "This is the description of my plugin.",
   "exports": {

lerna.json

@@ -1,4 +1,4 @@
 {
-  "version": "5.0.0-beta.6",
+  "version": "5.0.0-beta.7",
   "npmClient": "yarn"
 }

package.json

@@ -94,9 +94,8 @@
     "@types/fs-extra": "11.0.4",
     "@types/git-url-parse": "9.0.3",
     "@types/prompts": "2.4.9",
-    "@types/react": "18.2.66",
-    "@types/react-dom": "18.2.22",
-    "@types/styled-components": "5.1.34",
+    "@types/react": "18.3.2",
+    "@types/react-dom": "18.3.0",
     "@typescript-eslint/eslint-plugin": "6.7.3",
     "@typescript-eslint/parser": "6.7.3",
     "babel-eslint": "10.1.0",

packages/admin-test-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin-test-utils",
-  "version": "5.0.0-beta.6",
+  "version": "5.0.0-beta.7",
   "private": true,
   "description": "Test utilities for the Strapi administration panel",
   "license": "MIT",
@@ -80,10 +80,10 @@
   "devDependencies": {
     "@reduxjs/toolkit": "1.9.7",
     "@strapi/pack-up": "5.0.0",
-    "@testing-library/jest-dom": "5.16.5",
-    "eslint-config-custom": "5.0.0-beta.6",
+    "@testing-library/jest-dom": "6.4.5",
+    "eslint-config-custom": "5.0.0-beta.7",
     "jest-environment-jsdom": "29.6.1",
-    "tsconfig": "5.0.0-beta.6"
+    "tsconfig": "5.0.0-beta.7"
   },
   "peerDependencies": {
     "@reduxjs/toolkit": "^1.9.7",

packages/admin-test-utils/src/setup.ts

@@ -68,6 +68,8 @@ window.console = {
       /Unknown event handler property/.test(message)
     ) {
       // do nothing
+    } else if (/Support for defaultProps will be removed/gi.test(message)) {
+      // do nothing
     } else {
       throw new Error(message);
     }