Merge branch 'main' into features/morphs-populate

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

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

.github/workflows/addToProject.yml

@@ -6,6 +6,7 @@ on:
       - opened
       - transferred
 
+permissions: {}
 jobs:
   add-to-project:
     name: Add issue to Support Team project

.github/workflows/contributor-doc.yml

@@ -17,8 +17,12 @@ defaults:
   run:
     working-directory: docs
 
+permissions: {}
 jobs:
   deploy:
+    permissions:
+      contents: write  #  to push pages branch (peaceiris/actions-gh-pages)
+
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}

.github/workflows/nightly.yml

@@ -5,6 +5,9 @@ on:
     - cron: '0 0 * * 2-6'
   workflow_dispatch:
 
+permissions:
+  contents: read  #  to fetch code (actions/checkout)
+
 jobs:
   publish:
     name: 'Publish'

.github/workflows/skipped_tests.yml

@@ -0,0 +1,78 @@
+name: 'Tests'
+
+on:
+  pull_request:
+    paths:
+      - 'docs/**'
+      - '**.mdx?'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    name: 'lint (node: ${{ matrix.node }})'
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: [14, 16, 18]
+    steps:
+      - run: echo "Skipped"
+
+  unit_back:
+    name: 'unit_back (node: ${{ matrix.node }})'
+    needs: [lint]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: [14, 16, 18]
+    steps:
+      - run: echo "Skipped"
+
+  unit_front:
+    name: 'unit_front (node: ${{ matrix.node }})'
+    needs: [lint]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: [14, 16, 18]
+    steps:
+      - run: echo "Skipped"
+
+  api_ce_pg:
+    runs-on: ubuntu-latest
+    needs: [lint, unit_back, unit_front]
+    name: '[CE] API Integration (postgres, node: ${{ matrix.node }})'
+    strategy:
+      matrix:
+        node: [14, 16, 18]
+    steps:
+      - run: echo "Skipped"
+
+  api_ce_mysql:
+    runs-on: ubuntu-latest
+    needs: [lint, unit_back, unit_front]
+    name: '[CE] API Integration (mysql, node: ${{ matrix.node }})'
+    strategy:
+      matrix:
+        node: [14, 16, 18]
+    steps:
+      - run: echo "Skipped"
+
+  api_ce_mysql_5:
+    runs-on: ubuntu-latest
+    needs: [lint, unit_back, unit_front]
+    name: '[CE] API Integration (mysql:5 , node: ${{ matrix.node }})'
+    strategy:
+      matrix:
+        node: [14, 16, 18]
+    steps:
+      - run: echo "Skipped"
+
+  api_ce_sqlite:
+    runs-on: ubuntu-latest
+    needs: [lint, unit_back, unit_front]
+    name: '[CE] API Integration (sqlite: ${{ matrix.sqlite_pkg }}, node: ${{ matrix.node }})'
+    steps:
+      - run: echo "Skipped"

.github/workflows/tests.yml

@@ -13,6 +13,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}
   cancel-in-progress: true
 
+permissions:
+  contents: read  #  to fetch code (actions/checkout)
+
 jobs:
   lint:
     name: 'lint (node: ${{ matrix.node }})'

examples/getstarted/package.json

@@ -1,7 +1,7 @@
 {
   "name": "getstarted",
   "private": true,
-  "version": "4.5.1",
+  "version": "4.5.2",
   "description": "A Strapi application.",
   "scripts": {
     "develop": "strapi develop",
@@ -12,16 +12,16 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@strapi/plugin-color-picker": "4.5.1",
-    "@strapi/plugin-documentation": "4.5.1",
-    "@strapi/plugin-graphql": "4.5.1",
-    "@strapi/plugin-i18n": "4.5.1",
-    "@strapi/plugin-sentry": "4.5.1",
-    "@strapi/plugin-users-permissions": "4.5.1",
-    "@strapi/provider-email-mailgun": "4.5.1",
-    "@strapi/provider-upload-aws-s3": "4.5.1",
-    "@strapi/provider-upload-cloudinary": "4.5.1",
-    "@strapi/strapi": "4.5.1",
+    "@strapi/plugin-color-picker": "4.5.2",
+    "@strapi/plugin-documentation": "4.5.2",
+    "@strapi/plugin-graphql": "4.5.2",
+    "@strapi/plugin-i18n": "4.5.2",
+    "@strapi/plugin-sentry": "4.5.2",
+    "@strapi/plugin-users-permissions": "4.5.2",
+    "@strapi/provider-email-mailgun": "4.5.2",
+    "@strapi/provider-upload-aws-s3": "4.5.2",
+    "@strapi/provider-upload-cloudinary": "4.5.2",
+    "@strapi/strapi": "4.5.2",
     "@vscode/sqlite3": "5.0.8",
     "better-sqlite3": "7.4.6",
     "lodash": "4.17.21",

examples/getstarted/src/api/kitchensink/content-types/kitchensink/schema.json

@@ -134,6 +134,11 @@
     "custom_field": {
       "type": "customField",
       "customField": "plugin::color-picker.color"
+    },
+    "custom_field_with_default_options": {
+      "type": "customField",
+      "regex": "^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$",
+      "customField": "plugin::color-picker.color"
     }
   }
 }

examples/getstarted/src/plugins/myplugin/admin/src/index.js

@@ -26,6 +26,48 @@ export default {
       id: pluginId,
       name,
     });
+
+    const allTypes = [
+      'biginteger',
+      'boolean',
+      'date',
+      'datetime',
+      'decimal',
+      'email',
+      'enumeration',
+      'float',
+      'integer',
+      'json',
+      'password',
+      'richtext',
+      'string',
+      'text',
+      'time',
+      'uid',
+    ];
+
+    allTypes.forEach((type) => {
+      const upcasedType = type.charAt(0).toUpperCase() + type.slice(1);
+      const customField = {
+        type,
+        pluginId: 'myplugin',
+        name: `custom${upcasedType}`,
+        intlLabel: {
+          id: 'customfieldtest',
+          defaultMessage: `custom${upcasedType}`,
+        },
+        intlDescription: {
+          id: 'customfieldtest',
+          defaultMessage: `custom${upcasedType}`,
+        },
+        components: {
+          Input: async () =>
+            import(/* webpackChunkName: "test-custom-field" */ './components/PluginIcon'),
+        },
+      };
+
+      app.customFields.register(customField);
+    });
   },
   bootstrap() {},
   async registerTrads({ locales }) {

examples/getstarted/src/plugins/myplugin/server/register.js

@@ -1,6 +1,34 @@
 'use strict';
 
 module.exports = ({ strapi }) => {
+  const allTypes = [
+    'biginteger',
+    'boolean',
+    'date',
+    'datetime',
+    'decimal',
+    'email',
+    'enumeration',
+    'float',
+    'integer',
+    'json',
+    'password',
+    'richtext',
+    'string',
+    'text',
+    'time',
+    'uid',
+  ];
+
+  allTypes.forEach((type) => {
+    const upcasedType = type.charAt(0).toUpperCase() + type.slice(1);
+    strapi.customFields.register({
+      type,
+      name: `custom${upcasedType}`,
+      plugin: 'myplugin',
+    });
+  });
+
   if (strapi.plugin('graphql')) {
     require('./graphql')({ strapi });
   }

examples/kitchensink-ts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kitchensink-ts",
   "private": true,
-  "version": "4.5.1",
+  "version": "4.5.2",
   "description": "A Strapi application",
   "scripts": {
     "develop": "strapi develop",
@@ -10,9 +10,9 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@strapi/plugin-i18n": "4.5.1",
-    "@strapi/plugin-users-permissions": "4.5.1",
-    "@strapi/strapi": "4.5.1",
+    "@strapi/plugin-i18n": "4.5.2",
+    "@strapi/plugin-users-permissions": "4.5.2",
+    "@strapi/strapi": "4.5.2",
     "better-sqlite3": "7.4.6"
   },
   "author": {

examples/kitchensink/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kitchensink",
   "private": true,
-  "version": "4.5.1",
+  "version": "4.5.2",
   "description": "A Strapi application.",
   "scripts": {
     "develop": "strapi develop",
@@ -12,10 +12,10 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@strapi/provider-email-mailgun": "4.5.1",
-    "@strapi/provider-upload-aws-s3": "4.5.1",
-    "@strapi/provider-upload-cloudinary": "4.5.1",
-    "@strapi/strapi": "4.5.1",
+    "@strapi/provider-email-mailgun": "4.5.2",
+    "@strapi/provider-upload-aws-s3": "4.5.2",
+    "@strapi/provider-upload-cloudinary": "4.5.2",
+    "@strapi/strapi": "4.5.2",
     "lodash": "4.17.21",
     "mysql": "2.18.1",
     "passport-google-oauth2": "0.2.0",

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.5.1",
+  "version": "4.5.2",
   "packages": [
     "packages/*",
     "examples/*"

packages/admin-test-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin-test-utils",
-  "version": "4.5.1",
+  "version": "4.5.2",
   "private": true,
   "description": "Test utilities for the Strapi administration panel",
   "license": "MIT",

packages/cli/create-strapi-app/package.json

@@ -1,10 +1,10 @@
 {
   "name": "create-strapi-app",
-  "version": "4.5.1",
+  "version": "4.5.2",
   "description": "Generate a new Strapi application.",
   "dependencies": {
-    "@strapi/generate-new": "4.5.1",
-    "commander": "6.1.0",
+    "@strapi/generate-new": "4.5.2",
+    "commander": "7.2.0",
     "inquirer": "8.2.4"
   },
   "keywords": [

packages/cli/create-strapi-starter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-strapi-starter",
-  "version": "4.5.1",
+  "version": "4.5.2",
   "description": "Generate a new Strapi application.",
   "keywords": [
     "create-strapi-starter",
@@ -38,10 +38,10 @@
     "test": "echo \"no tests yet\""
   },
   "dependencies": {
-    "@strapi/generate-new": "4.5.1",
+    "@strapi/generate-new": "4.5.2",
     "chalk": "4.1.1",
     "ci-info": "3.5.0",
-    "commander": "7.1.0",
+    "commander": "7.2.0",
     "execa": "5.1.1",
     "fs-extra": "10.0.0",
     "inquirer": "8.2.4",