Merge remote-tracking branch 'origin/v5/main' into chore/history-rela…

…tions-e2e
strapi · May 23, 2024 · 0c72b6f · 0c72b6f
2 parents bbb5c08 + cffa227
commit 0c72b6f
Show file tree

Hide file tree

Showing 57 changed files with 762 additions and 617 deletions.
diff --git a/.github/actions/check-pr-status/package.json b/.github/actions/check-pr-status/package.json
@@ -1,6 +1,6 @@
 {
   "name": "check-pr-status",
-  "version": "5.0.0-beta.7",
+  "version": "5.0.0-beta.8",
   "private": true,
   "license": "MIT",
   "main": "dist/index.js",

diff --git a/.gitignore b/.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

diff --git a/examples/getstarted/package.json b/examples/getstarted/package.json
@@ -1,6 +1,6 @@
 {
   "name": "getstarted",
-  "version": "5.0.0-beta.7",
+  "version": "5.0.0-beta.8",
   "private": true,
   "description": "A Strapi application.",
   "license": "SEE LICENSE IN LICENSE",
@@ -14,15 +14,15 @@
   },
   "dependencies": {
     "@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",
+    "@strapi/plugin-color-picker": "5.0.0-beta.8",
+    "@strapi/plugin-documentation": "5.0.0-beta.8",
+    "@strapi/plugin-graphql": "5.0.0-beta.8",
+    "@strapi/plugin-sentry": "5.0.0-beta.8",
+    "@strapi/plugin-users-permissions": "5.0.0-beta.8",
+    "@strapi/provider-email-mailgun": "5.0.0-beta.8",
+    "@strapi/provider-upload-aws-s3": "5.0.0-beta.8",
+    "@strapi/provider-upload-cloudinary": "5.0.0-beta.8",
+    "@strapi/strapi": "5.0.0-beta.8",
     "better-sqlite3": "9.4.3",
     "lodash": "4.17.21",
     "mysql2": "3.6.2",

diff --git a/examples/kitchensink-ts/package.json b/examples/kitchensink-ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kitchensink-ts",
-  "version": "5.0.0-beta.7",
+  "version": "5.0.0-beta.8",
   "private": true,
   "description": "A Strapi application",
   "license": "MIT",
@@ -14,8 +14,8 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@strapi/plugin-users-permissions": "5.0.0-beta.7",
-    "@strapi/strapi": "5.0.0-beta.7",
+    "@strapi/plugin-users-permissions": "5.0.0-beta.8",
+    "@strapi/strapi": "5.0.0-beta.8",
     "better-sqlite3": "9.4.3",
     "react": "18.3.1",
     "react-dom": "18.3.1",

diff --git a/examples/kitchensink/package.json b/examples/kitchensink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kitchensink",
-  "version": "5.0.0-beta.7",
+  "version": "5.0.0-beta.8",
   "private": true,
   "description": "A Strapi application.",
   "license": "SEE LICENSE IN LICENSE",
@@ -13,10 +13,10 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@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",
+    "@strapi/provider-email-mailgun": "5.0.0-beta.8",
+    "@strapi/provider-upload-aws-s3": "5.0.0-beta.8",
+    "@strapi/provider-upload-cloudinary": "5.0.0-beta.8",
+    "@strapi/strapi": "5.0.0-beta.8",
     "better-sqlite3": "9.4.3",
     "lodash": "4.17.21",
     "mysql2": "3.6.2",

diff --git a/examples/plugins/workspace-plugin/package.json b/examples/plugins/workspace-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-workspace-plugin",
-  "version": "5.0.0-beta.7",
+  "version": "5.0.0-beta.8",
   "private": true,
   "description": "This is the description of my plugin.",
   "exports": {

diff --git a/lerna.json b/lerna.json
@@ -1,4 +1,4 @@
 {
-  "version": "5.0.0-beta.7",
+  "version": "5.0.0-beta.8",
   "npmClient": "yarn"
 }
diff --git a/packages/admin-test-utils/package.json b/packages/admin-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin-test-utils",
-  "version": "5.0.0-beta.7",
+  "version": "5.0.0-beta.8",
   "private": true,
   "description": "Test utilities for the Strapi administration panel",
   "license": "MIT",
@@ -81,9 +81,9 @@
     "@reduxjs/toolkit": "1.9.7",
     "@strapi/pack-up": "5.0.0",
     "@testing-library/jest-dom": "6.4.5",
-    "eslint-config-custom": "5.0.0-beta.7",
+    "eslint-config-custom": "5.0.0-beta.8",
     "jest-environment-jsdom": "29.6.1",
-    "tsconfig": "5.0.0-beta.7"
+    "tsconfig": "5.0.0-beta.8"
   },
   "peerDependencies": {
     "@reduxjs/toolkit": "^1.9.7",

diff --git a/packages/cli/create-strapi-app/package.json b/packages/cli/create-strapi-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-strapi-app",
-  "version": "5.0.0-beta.7",
+  "version": "5.0.0-beta.8",
   "description": "Generate a new Strapi application.",
   "keywords": [
     "create-strapi-app",
@@ -43,14 +43,14 @@
     "watch": "pack-up watch"
   },
   "dependencies": {
-    "@strapi/generate-new": "5.0.0-beta.7",
+    "@strapi/generate-new": "5.0.0-beta.8",
     "commander": "8.3.0",
     "inquirer": "8.2.5"
   },
   "devDependencies": {
     "@strapi/pack-up": "5.0.0",
-    "eslint-config-custom": "5.0.0-beta.7",
-    "tsconfig": "5.0.0-beta.7"
+    "eslint-config-custom": "5.0.0-beta.8",
+    "tsconfig": "5.0.0-beta.8"
   },
   "engines": {
     "node": ">=18.0.0 <=20.x.x",

diff --git a/packages/cli/create-strapi-starter/package.json b/packages/cli/create-strapi-starter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-strapi-starter",
-  "version": "5.0.0-beta.7",
+  "version": "5.0.0-beta.8",
   "description": "Generate a new Strapi application.",
   "keywords": [
     "create-strapi-starter",
@@ -43,7 +43,7 @@
     "watch": "pack-up watch"
   },
   "dependencies": {
-    "@strapi/generate-new": "5.0.0-beta.7",
+    "@strapi/generate-new": "5.0.0-beta.8",
     "chalk": "4.1.2",
     "ci-info": "4.0.0",
     "commander": "8.3.0",
@@ -55,8 +55,8 @@
   "devDependencies": {
     "@strapi/pack-up": "5.0.0",
     "@types/fs-extra": "11.0.4",
-    "eslint-config-custom": "5.0.0-beta.7",
-    "tsconfig": "5.0.0-beta.7"
+    "eslint-config-custom": "5.0.0-beta.8",
+    "tsconfig": "5.0.0-beta.8"
   },
   "engines": {
     "node": ">=18.0.0 <=20.x.x",

diff --git a/packages/cli/create-strapi-starter/src/resources/gitignore b/packages/cli/create-strapi-starter/src/resources/gitignore
@@ -82,6 +82,8 @@ ssl
 nbproject
 public/uploads/*
 !public/uploads/.gitkeep
+.tsbuildinfo
+.eslintcache
 
 ############################
 # Node.js
@@ -101,6 +103,21 @@ node_modules
 
 coverage
 
+############################
+# Package managers
+############################
+
+.yarn/*
+!.yarn/cache
+!.yarn/unplugged
+!.yarn/patches
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+.pnp.*
+yarn-error.log
+
+
 ############################
 # Strapi
 ############################

diff --git a/packages/cli/create-strapi/package.json b/packages/cli/create-strapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-strapi",
-  "version": "5.0.0-beta.7",
+  "version": "5.0.0-beta.8",
   "description": "Generate a new Strapi application.",
   "keywords": [
     "create-strapi",
@@ -36,7 +36,7 @@
     "bin/"
   ],
   "dependencies": {
-    "create-strapi-app": "5.0.0-beta.7"
+    "create-strapi-app": "5.0.0-beta.8"
   },
   "engines": {
     "node": ">=18.0.0 <=20.x.x",

diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "5.0.0-beta.7",
+  "version": "5.0.0-beta.8",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -80,11 +80,11 @@
     "@reduxjs/toolkit": "1.9.7",
     "@strapi/design-system": "2.0.0-beta.4",
     "@strapi/icons": "2.0.0-beta.4",
-    "@strapi/permissions": "5.0.0-beta.7",
-    "@strapi/provider-audit-logs-local": "5.0.0-beta.7",
-    "@strapi/types": "5.0.0-beta.7",
-    "@strapi/typescript-utils": "5.0.0-beta.7",
-    "@strapi/utils": "5.0.0-beta.7",
+    "@strapi/permissions": "5.0.0-beta.8",
+    "@strapi/provider-audit-logs-local": "5.0.0-beta.8",
+    "@strapi/types": "5.0.0-beta.8",
+    "@strapi/typescript-utils": "5.0.0-beta.8",
+    "@strapi/utils": "5.0.0-beta.8",
     "@testing-library/dom": "10.1.0",
     "@testing-library/react": "15.0.7",
     "@testing-library/user-event": "14.5.2",
@@ -137,8 +137,8 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@strapi/admin-test-utils": "5.0.0-beta.7",
-    "@strapi/data-transfer": "5.0.0-beta.7",
+    "@strapi/admin-test-utils": "5.0.0-beta.8",
+    "@strapi/data-transfer": "5.0.0-beta.8",
     "@strapi/pack-up": "5.0.0",
     "@types/codemirror5": "npm:@types/codemirror@^5.60.15",
     "@types/fs-extra": "11.0.4",

diff --git a/packages/core/content-manager/package.json b/packages/core/content-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/content-manager",
-  "version": "5.0.0-beta.7",
+  "version": "5.0.0-beta.8",
   "description": "A powerful UI to easily manage your data.",
   "repository": {
     "type": "git",
@@ -62,8 +62,8 @@
     "@sindresorhus/slugify": "1.1.0",
     "@strapi/design-system": "2.0.0-beta.4",
     "@strapi/icons": "2.0.0-beta.4",
-    "@strapi/types": "5.0.0-beta.7",
-    "@strapi/utils": "5.0.0-beta.7",
+    "@strapi/types": "5.0.0-beta.8",
+    "@strapi/utils": "5.0.0-beta.8",
     "codemirror5": "npm:codemirror@^5.65.11",
     "date-fns": "2.30.0",
     "fractional-indexing": "3.2.0",
@@ -97,7 +97,7 @@
     "yup": "0.32.9"
   },
   "devDependencies": {
-    "@strapi/admin": "5.0.0-beta.7",
+    "@strapi/admin": "5.0.0-beta.8",
     "@strapi/database": "workspace:*",
     "@strapi/pack-up": "5.0.0",
     "@testing-library/react": "15.0.7",

diff --git a/packages/core/content-releases/package.json b/packages/core/content-releases/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/content-releases",
-  "version": "5.0.0-beta.7",
+  "version": "5.0.0-beta.8",
   "description": "Strapi plugin for organizing and releasing content",
   "repository": {
     "type": "git",
@@ -58,7 +58,7 @@
     "@strapi/design-system": "2.0.0-beta.4",
     "@strapi/icons": "2.0.0-beta.4",
     "@strapi/types": "workspace:*",
-    "@strapi/utils": "5.0.0-beta.7",
+    "@strapi/utils": "5.0.0-beta.8",
     "date-fns": "2.30.0",
     "date-fns-tz": "2.0.1",
     "formik": "2.4.5",
@@ -69,9 +69,9 @@
     "yup": "0.32.9"
   },
   "devDependencies": {
-    "@strapi/admin": "5.0.0-beta.7",
-    "@strapi/admin-test-utils": "5.0.0-beta.7",
-    "@strapi/content-manager": "5.0.0-beta.7",
+    "@strapi/admin": "5.0.0-beta.8",
+    "@strapi/admin-test-utils": "5.0.0-beta.8",
+    "@strapi/content-manager": "5.0.0-beta.8",
     "@strapi/pack-up": "5.0.0",
     "@testing-library/react": "15.0.7",
     "@testing-library/user-event": "14.5.2",

diff --git a/packages/core/content-type-builder/package.json b/packages/core/content-type-builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/content-type-builder",
-  "version": "5.0.0-beta.7",
+  "version": "5.0.0-beta.8",
   "description": "Create and manage content types",
   "repository": {
     "type": "git",
@@ -59,9 +59,9 @@
     "@reduxjs/toolkit": "1.9.7",
     "@sindresorhus/slugify": "1.1.0",
     "@strapi/design-system": "2.0.0-beta.4",
-    "@strapi/generators": "5.0.0-beta.7",
+    "@strapi/generators": "5.0.0-beta.8",
     "@strapi/icons": "2.0.0-beta.4",
-    "@strapi/utils": "5.0.0-beta.7",
+    "@strapi/utils": "5.0.0-beta.8",
     "date-fns": "2.30.0",
     "fs-extra": "11.2.0",
     "immer": "9.0.21",
@@ -73,9 +73,9 @@
     "yup": "0.32.9"
   },
   "devDependencies": {
-    "@strapi/admin": "5.0.0-beta.7",
+    "@strapi/admin": "5.0.0-beta.8",
     "@strapi/pack-up": "5.0.0",
-    "@strapi/types": "5.0.0-beta.7",
+    "@strapi/types": "5.0.0-beta.8",
     "@testing-library/react": "15.0.7",
     "@testing-library/user-event": "14.5.2",
     "@types/fs-extra": "11.0.4",