Merge branch 'develop' into enhancement/up-custom-callback-validation

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

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

SECURITY.md

@@ -2,8 +2,9 @@
 
 ## Supported Versions
 
-As of June 2023 (and until this document is updated), only the v4.x.x _GA_ releases of Strapi are supported for updates and bug fixes. Any previous versions are currently not supported and users are advised to use them "at their own risk".
+As of April 2024 (and until this document is updated), only the v4.x.x _GA_ or _STABLE_ releases of Strapi are supported for updates and bug fixes. Any previous versions are currently not supported and users are advised to use them "at their own risk".
 
+- v5.x.x **Beta** is considered unstable is only supported during the beta period for **NON-PRODUCTION** usage
 - v4.x.x **Stable** is considered LTS until further notice
 - v4.x.x **Beta** is considered unstable and not supported
 - v4.x.x **Alpha** is considered unstable and not supported
@@ -60,4 +61,4 @@ List of some (though not all) platforms **we do not support**:
 - Direct email or communication to Strapi employees (Discord, Slack, or Email)
 - Stack Overflow
 
-Strapi does not currently and has no plans to offer any bug bounties, swag, or any other reward for reporting vulnerabilities. At most during our public disclosure we can give credit to the reporter and link to any social accounts you wish to have us add including linking to your own blog post detailing the vulnerability if you wish.
+**Strapi does not currently and has no plans to offer any bug bounties, swag, or any other reward for reporting vulnerabilities.** At most during our public disclosure we can give credit to the reporter and link to any social accounts you wish to have us add including linking to your own blog post detailing the vulnerability if you wish.

docs/docusaurus.config.js

@@ -38,6 +38,12 @@ const config = {
         };
       },
     }),
+    [
+      '@cmfcmf/docusaurus-search-local',
+      {
+        indexBlog: false,
+      },
+    ],
   ],
   presets: [
     [

docs/package.json

@@ -26,6 +26,7 @@
     ]
   },
   "dependencies": {
+    "@cmfcmf/docusaurus-search-local": "1.1.0",
     "@docusaurus/core": "3.1.1",
     "@docusaurus/preset-classic": "3.1.1",
     "@mdx-js/react": "^3.0.0",

docs/yarn.lock

@@ -5,6 +5,16 @@ __metadata:
   version: 8
   cacheKey: 10
 
+"@algolia/autocomplete-core@npm:1.17.0":
+  version: 1.17.0
+  resolution: "@algolia/autocomplete-core@npm:1.17.0"
+  dependencies:
+    "@algolia/autocomplete-plugin-algolia-insights": "npm:1.17.0"
+    "@algolia/autocomplete-shared": "npm:1.17.0"
+  checksum: 09b0beaf3e742db9f278d951a76a51ef328ac7545564d692d54c0d9e54600e1836a9f03281585bd3cc056c0afa8f9cb9936755aab6b7e46492d463b76f117410
+  languageName: node
+  linkType: hard
+
 "@algolia/autocomplete-core@npm:1.9.3":
   version: 1.9.3
   resolution: "@algolia/autocomplete-core@npm:1.9.3"
@@ -15,6 +25,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@algolia/autocomplete-js@npm:^1.8.2":
+  version: 1.17.0
+  resolution: "@algolia/autocomplete-js@npm:1.17.0"
+  dependencies:
+    "@algolia/autocomplete-core": "npm:1.17.0"
+    "@algolia/autocomplete-preset-algolia": "npm:1.17.0"
+    "@algolia/autocomplete-shared": "npm:1.17.0"
+    htm: "npm:^3.1.1"
+    preact: "npm:^10.13.2"
+  peerDependencies:
+    "@algolia/client-search": ">= 4.5.1 < 6"
+    algoliasearch: ">= 4.9.1 < 6"
+  checksum: e40576eeaf245242d44453c7c1c4860a239ab7b85d8ab59b53fa8479e248dce8ecf9adc91162f2c7f0d37b2da0c123010efa6975714abd0f56dd7d7e99dab674
+  languageName: node
+  linkType: hard
+
+"@algolia/autocomplete-plugin-algolia-insights@npm:1.17.0":
+  version: 1.17.0
+  resolution: "@algolia/autocomplete-plugin-algolia-insights@npm:1.17.0"
+  dependencies:
+    "@algolia/autocomplete-shared": "npm:1.17.0"
+  peerDependencies:
+    search-insights: ">= 1 < 3"
+  checksum: 99fb44f998acf340bac6ba039e434e925c24d20d3ebca462e8a0b3e8091da239b19a5a18be4e2abd9dae58398cfd6843f9f630e300a394abe292164bbfe0dee3
+  languageName: node
+  linkType: hard
+
 "@algolia/autocomplete-plugin-algolia-insights@npm:1.9.3":
   version: 1.9.3
   resolution: "@algolia/autocomplete-plugin-algolia-insights@npm:1.9.3"
@@ -26,6 +63,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@algolia/autocomplete-preset-algolia@npm:1.17.0":
+  version: 1.17.0
+  resolution: "@algolia/autocomplete-preset-algolia@npm:1.17.0"
+  dependencies:
+    "@algolia/autocomplete-shared": "npm:1.17.0"
+  peerDependencies:
+    "@algolia/client-search": ">= 4.9.1 < 6"
+    algoliasearch: ">= 4.9.1 < 6"
+  checksum: 9d1b879d56f123b974a1aabfeedce7204ba1dec11894d6642f3282d127beac63607dcfe5c79ea2948c35683288f436f916215c3f08ec9cddd2c8d102107a2ed6
+  languageName: node
+  linkType: hard
+
 "@algolia/autocomplete-preset-algolia@npm:1.9.3":
   version: 1.9.3
   resolution: "@algolia/autocomplete-preset-algolia@npm:1.9.3"
@@ -38,6 +87,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@algolia/autocomplete-shared@npm:1.17.0":
+  version: 1.17.0
+  resolution: "@algolia/autocomplete-shared@npm:1.17.0"
+  peerDependencies:
+    "@algolia/client-search": ">= 4.9.1 < 6"
+    algoliasearch: ">= 4.9.1 < 6"
+  checksum: 19d2937ece343c2ad99bb362a27ded5c08bde4b8b5eadc04d3de1371cb2bcee377f29f841abce9d4578160cb9e9406f6216cc06dad0128bff9d4b7115cffab9e
+  languageName: node
+  linkType: hard
+
 "@algolia/autocomplete-shared@npm:1.9.3":
   version: 1.9.3
   resolution: "@algolia/autocomplete-shared@npm:1.9.3"
@@ -48,6 +107,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@algolia/autocomplete-theme-classic@npm:^1.8.2":
+  version: 1.17.0
+  resolution: "@algolia/autocomplete-theme-classic@npm:1.17.0"
+  checksum: 17f9617d7cb9587d668f17991c9749ec04fa561891181e64613805b9528c37309ddad3192fced2763284a80df960b85c4fe17d8ff42cbab88f6e555050f8a859
+  languageName: node
+  linkType: hard
+
 "@algolia/cache-browser-local-storage@npm:4.23.2":
   version: 4.23.2
   resolution: "@algolia/cache-browser-local-storage@npm:4.23.2"
@@ -117,7 +183,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@algolia/client-search@npm:4.23.2":
+"@algolia/client-search@npm:4.23.2, @algolia/client-search@npm:^4.12.0":
   version: 4.23.2
   resolution: "@algolia/client-search@npm:4.23.2"
   dependencies:
@@ -2033,6 +2099,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@cmfcmf/docusaurus-search-local@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@cmfcmf/docusaurus-search-local@npm:1.1.0"
+  dependencies:
+    "@algolia/autocomplete-js": "npm:^1.8.2"
+    "@algolia/autocomplete-theme-classic": "npm:^1.8.2"
+    "@algolia/client-search": "npm:^4.12.0"
+    algoliasearch: "npm:^4.12.0"
+    cheerio: "npm:^1.0.0-rc.9"
+    clsx: "npm:^1.1.1"
+    lunr-languages: "npm:^1.4.0"
+    mark.js: "npm:^8.11.1"
+  peerDependencies:
+    "@docusaurus/core": ^2.0.0
+    nodejieba: ^2.5.0
+  peerDependenciesMeta:
+    nodejieba:
+      optional: true
+  checksum: 5c5692ab133873930fa1c0db07b09a13dfc4c3d95908e506c3cd72746ceedaf97d6d1328044921abe90d377d6a90cb277328ca8639ef10556b0b58d48681c067
+  languageName: node
+  linkType: hard
+
 "@colors/colors@npm:1.5.0":
   version: 1.5.0
   resolution: "@colors/colors@npm:1.5.0"
@@ -3914,7 +4002,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"algoliasearch@npm:^4.18.0, algoliasearch@npm:^4.19.1":
+"algoliasearch@npm:^4.12.0, algoliasearch@npm:^4.18.0, algoliasearch@npm:^4.19.1":
   version: 4.23.2
   resolution: "algoliasearch@npm:4.23.2"
   dependencies:
@@ -4539,7 +4627,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cheerio@npm:^1.0.0-rc.12":
+"cheerio@npm:^1.0.0-rc.12, cheerio@npm:^1.0.0-rc.9":
   version: 1.0.0-rc.12
   resolution: "cheerio@npm:1.0.0-rc.12"
   dependencies:
@@ -5500,6 +5588,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "docs@workspace:."
   dependencies:
+    "@cmfcmf/docusaurus-search-local": "npm:1.1.0"
     "@docusaurus/core": "npm:3.1.1"
     "@docusaurus/module-type-aliases": "npm:3.1.1"
     "@docusaurus/preset-classic": "npm:3.1.1"
@@ -6794,6 +6883,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"htm@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "htm@npm:3.1.1"
+  checksum: cb862dc5c9eac532937af7a9e26edd1e0e7939fc78a06efde4ae10b3a145f9506e644ff084c871dd808c315342b56fd0baa174a2a2cdf6071a4130ee0abee9e0
+  languageName: node
+  linkType: hard
+
 "html-entities@npm:^2.3.2":
   version: 2.3.3
   resolution: "html-entities@npm:2.3.3"
@@ -7854,6 +7950,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lunr-languages@npm:^1.4.0":
+  version: 1.14.0
+  resolution: "lunr-languages@npm:1.14.0"
+  checksum: bb17d7e481efcf262de930b2e0980e0b33790c80a0aec1aeb102f4a32ad4418971efeae2bb1b6841825c1b055fca68dea37aea871524e9d84a451a113076d933
+  languageName: node
+  linkType: hard
+
 "make-fetch-happen@npm:^10.0.3":
   version: 10.2.1
   resolution: "make-fetch-happen@npm:10.2.1"
@@ -7878,6 +7981,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mark.js@npm:^8.11.1":
+  version: 8.11.1
+  resolution: "mark.js@npm:8.11.1"
+  checksum: 3b01b9ea4761f2104ab1fbe2cc917c0a9ca580f778f62edde7eb95c6322330cba0ddc45f8aa163ef5b0b3b3eeba20df683b42831fbe5e8429ff3b4b4cecfd28a
+  languageName: node
+  linkType: hard
+
 "markdown-extensions@npm:^2.0.0":
   version: 2.0.0
   resolution: "markdown-extensions@npm:2.0.0"
@@ -10046,6 +10156,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"preact@npm:^10.13.2":
+  version: 10.20.1
+  resolution: "preact@npm:10.20.1"
+  checksum: 894ac14b3ec6f8ca308b53fb14e12e57678248fd1faa24ae857f5e37d9c11b34833e6dd1ba8210a34de4d6d523462923b1f9c93d35ce433874affd056f2d0998
+  languageName: node
+  linkType: hard
+
 "pretty-error@npm:^4.0.0":
   version: 4.0.0
   resolution: "pretty-error@npm:4.0.0"

examples/getstarted/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getstarted",
-  "version": "4.22.1",
+  "version": "4.24.1",
   "private": true,
   "description": "A Strapi application.",
   "license": "SEE LICENSE IN LICENSE",
@@ -13,21 +13,21 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@strapi/icons": "1.16.0",
-    "@strapi/plugin-color-picker": "4.22.1",
-    "@strapi/plugin-documentation": "4.22.1",
-    "@strapi/plugin-graphql": "4.22.1",
-    "@strapi/plugin-i18n": "4.22.1",
-    "@strapi/plugin-sentry": "4.22.1",
-    "@strapi/plugin-users-permissions": "4.22.1",
-    "@strapi/provider-email-mailgun": "4.22.1",
-    "@strapi/provider-upload-aws-s3": "4.22.1",
-    "@strapi/provider-upload-cloudinary": "4.22.1",
-    "@strapi/strapi": "4.22.1",
+    "@strapi/icons": "1.18.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",
-    "mysql2": "3.6.0",
+    "mysql2": "3.9.4",
     "passport-google-oauth2": "0.2.0",
     "pg": "8.11.1",
     "react": "^18.2.0",

examples/kitchensink-ts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchensink-ts",
-  "version": "4.22.1",
+  "version": "4.24.1",
   "private": true,
   "description": "A Strapi application",
   "license": "MIT",
@@ -14,9 +14,9 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@strapi/plugin-i18n": "4.22.1",
-    "@strapi/plugin-users-permissions": "4.22.1",
-    "@strapi/strapi": "4.22.1",
+    "@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",

examples/kitchensink/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchensink",
-  "version": "4.22.1",
+  "version": "4.24.1",
   "private": true,
   "description": "A Strapi application.",
   "license": "SEE LICENSE IN LICENSE",
@@ -13,13 +13,13 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@strapi/provider-email-mailgun": "4.22.1",
-    "@strapi/provider-upload-aws-s3": "4.22.1",
-    "@strapi/provider-upload-cloudinary": "4.22.1",
-    "@strapi/strapi": "4.22.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",
     "lodash": "4.17.21",
     "mysql": "2.18.1",
-    "mysql2": "3.6.0",
+    "mysql2": "3.9.4",
     "passport-google-oauth2": "0.2.0",
     "pg": "8.11.1",
     "react": "^18.2.0",

examples/plugins/workspace-plugin/package.json

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

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.22.1",
+  "version": "4.24.1",
   "packages": ["packages/*", "examples/*"],
   "npmClient": "yarn",
   "useWorkspaces": true,

package.json

@@ -33,6 +33,7 @@
     "build": "nx run-many --target=build --nx-ignore-cycles",
     "build:size": "cd examples/getstarted && yarn build",
     "build:ts": "nx run-many --target=build:ts --nx-ignore-cycles",
+    "build:watch": "nx watch --all --nx-ignore-cycles -- nx run \\$NX_PROJECT_NAME:build --nx-ignore-cycles",
     "clean": "nx run-many --target=clean --nx-ignore-cycles",
     "doc:api": "node scripts/open-api/serve.js",
     "format": "yarn format:code && yarn format:other",
@@ -68,11 +69,10 @@
     "test:ts:packages": "nx run-many --target=test:ts --nx-ignore-cycles",
     "test:unit": "jest --config jest.config.js",
     "test:unit:all": "nx run-many --target=test:unit --nx-ignore-cycles",
-    "test:unit:watch": "run test:unit --watch",
-    "watch": "nx run-many --target=watch --nx-ignore-cycles"
+    "test:unit:watch": "run test:unit --watch"
   },
   "resolutions": {
-    "@strapi/design-system": "1.17.0-typescript.0",
+    "@strapi/design-system": "1.19.0-typescript.0",
     "@types/koa": "2.13.4"
   },
   "devDependencies": {