Merge remote-tracking branch 'origin/main' into fix/relations/rel-error-handling

This commit is contained in:
Jamie Howard 2022-11-09 16:15:02 +00:00
commit dd26848f13
40 changed files with 149 additions and 100 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
{
"version": "4.4.7",
"version": "4.5.0",
"packages": [
"packages/*",
"examples/*"

View File

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

View File

@ -1,9 +1,9 @@
{
"name": "create-strapi-app",
"version": "4.4.7",
"version": "4.5.0",
"description": "Generate a new Strapi application.",
"dependencies": {
"@strapi/generate-new": "4.4.7",
"@strapi/generate-new": "4.5.0",
"commander": "6.1.0",
"inquirer": "8.2.4"
},

View File

@ -1,6 +1,6 @@
{
"name": "create-strapi-starter",
"version": "4.4.7",
"version": "4.5.0",
"description": "Generate a new Strapi application.",
"keywords": [
"create-strapi-starter",
@ -38,7 +38,7 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/generate-new": "4.4.7",
"@strapi/generate-new": "4.5.0",
"chalk": "4.1.1",
"ci-info": "3.3.2",
"commander": "7.1.0",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

View File

@ -0,0 +1,48 @@
<svg width="148" height="148" fill="none" xmlns="http://www.w3.org/2000/svg">
<g opacity=".8" fill-rule="evenodd" clip-rule="evenodd">
<path opacity=".15" d="M110.81 37H73.97V74.1h36.84V37Z" fill="url(#a)"/>
<path opacity=".07" d="M36.84 0H0v37.08h36.84V0Z" fill="url(#b)"/>
<path opacity=".07" d="M73.92 73.95H37.08v37.08h36.84V73.95Z" fill="url(#c)"/>
<path opacity=".07" d="M147.99 110.92h-37.3V148H148v-37.08Z" fill="url(#d)"/>
<path opacity=".15" d="M73.83 37H36.84L73.83 0v37Z" fill="url(#e)"/>
<path opacity=".15" d="M110.6 111.02v-37h36.98l-36.99 37Z" fill="url(#f)"/>
<path opacity=".4" d="M73.83 0v37h36.98v37.01h37V3a3 3 0 0 0-3-3H73.82Z" fill="url(#g)"/>
</g>
<defs>
<linearGradient id="a" x1="91.31" y1="83.31" x2="118.24" y2="56.59" gradientUnits="userSpaceOnUse">
<stop stop-color="#7A92FF"/>
<stop offset="1" stop-color="#3253EA"/>
</linearGradient>
<linearGradient id="b" x1="40.99" y1="13.88" x2=".01" y2="11.64" gradientUnits="userSpaceOnUse">
<stop stop-color="#A8B8FF"/>
<stop offset="1" stop-color="#3253EA"/>
</linearGradient>
<linearGradient id="c" x1="54.41" y1="120.25" x2="81.35" y2="93.52" gradientUnits="userSpaceOnUse">
<stop stop-color="#A8B8FF"/>
<stop offset="1" stop-color="#3253EA"/>
</linearGradient>
<linearGradient id="d" x1="128.24" y1="157.22" x2="155.17" y2="130.17" gradientUnits="userSpaceOnUse">
<stop stop-color="#A8B8FF"/>
<stop offset="1" stop-color="#3253EA"/>
</linearGradient>
<linearGradient id="e" x1="54.24" y1="46.21" x2="81.12" y2="19.38" gradientUnits="userSpaceOnUse">
<stop stop-color="#7A92FF"/>
<stop offset="1" stop-color="#3253EA"/>
</linearGradient>
<linearGradient id="f" x1="126.28" y1="74.05" x2="124.94" y2="111.07" gradientUnits="userSpaceOnUse">
<stop stop-color="#7A92FF"/>
<stop offset="1" stop-color="#3253EA"/>
</linearGradient>
<linearGradient id="g" x1="73.37" y1="36.87" x2="132.87" y2="66.74" gradientUnits="userSpaceOnUse">
<stop stop-color="#7A92FF"/>
<stop offset="1" stop-color="#3858EA"/>
</linearGradient>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@ -13,7 +13,7 @@ import { Layout } from '@strapi/design-system/Layout';
import { Main } from '@strapi/design-system/Main';
import { Box } from '@strapi/design-system/Box';
import { Grid, GridItem } from '@strapi/design-system/Grid';
import Logo from '../../assets/images/homepage-logo.png';
import cornerOrnamentPath from './assets/corner-ornament.svg';
import { useModels } from '../../hooks';
import isGuidedTourCompleted from '../../components/GuidedTour/utils/isGuidedTourCompleted';
import GuidedTourHomepage from '../../components/GuidedTour/Homepage';
@ -25,6 +25,7 @@ const LogoContainer = styled(Box)`
position: absolute;
top: 0;
right: 0;
img {
width: ${150 / 16}rem;
}
@ -64,7 +65,7 @@ const HomePage = () => {
</FormattedMessage>
<Main>
<LogoContainer>
<img alt="" aria-hidden src={Logo} />
<img alt="" aria-hidden src={cornerOrnamentPath} />
</LogoContainer>
<Box padding={10}>
<Grid>

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/admin",
"version": "4.4.7",
"version": "4.5.0",
"description": "Strapi Admin",
"repository": {
"type": "git",
@ -51,13 +51,13 @@
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/react-fontawesome": "^0.2.0",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.7",
"@strapi/babel-plugin-switch-ee-ce": "4.4.7",
"@strapi/babel-plugin-switch-ee-ce": "4.5.0",
"@strapi/design-system": "1.2.7",
"@strapi/helper-plugin": "4.4.7",
"@strapi/helper-plugin": "4.5.0",
"@strapi/icons": "1.2.7",
"@strapi/permissions": "4.4.7",
"@strapi/typescript-utils": "4.4.7",
"@strapi/utils": "4.4.7",
"@strapi/permissions": "4.5.0",
"@strapi/typescript-utils": "4.5.0",
"@strapi/utils": "4.5.0",
"axios": "0.27.2",
"babel-loader": "8.2.5",
"babel-plugin-styled-components": "2.0.2",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-content-manager",
"version": "4.4.7",
"version": "4.5.0",
"description": "A powerful UI to easily manage your data.",
"repository": {
"type": "git",
@ -24,7 +24,7 @@
},
"dependencies": {
"@sindresorhus/slugify": "1.1.0",
"@strapi/utils": "4.4.7",
"@strapi/utils": "4.5.0",
"lodash": "4.17.21"
},
"engines": {

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-content-type-builder",
"version": "4.4.7",
"version": "4.5.0",
"description": "Strapi plugin to create content type",
"repository": {
"type": "git",
@ -28,9 +28,9 @@
},
"dependencies": {
"@sindresorhus/slugify": "1.1.0",
"@strapi/generators": "4.4.7",
"@strapi/helper-plugin": "4.4.7",
"@strapi/utils": "4.4.7",
"@strapi/generators": "4.5.0",
"@strapi/helper-plugin": "4.5.0",
"@strapi/utils": "4.5.0",
"fs-extra": "10.0.0",
"lodash": "4.17.21",
"pluralize": "^8.0.0",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/database",
"version": "4.4.7",
"version": "4.5.0",
"description": "Strapi's database layer",
"homepage": "https://strapi.io",
"bugs": {

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-email",
"version": "4.4.7",
"version": "4.5.0",
"description": "Easily configure your Strapi application to send emails.",
"repository": {
"type": "git",
@ -26,12 +26,12 @@
"test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll"
},
"dependencies": {
"@strapi/provider-email-sendmail": "4.4.7",
"@strapi/utils": "4.4.7",
"@strapi/provider-email-sendmail": "4.5.0",
"@strapi/utils": "4.5.0",
"lodash": "4.17.21"
},
"devDependencies": {
"@strapi/helper-plugin": "4.4.7",
"@strapi/helper-plugin": "4.5.0",
"@testing-library/react": "12.1.4"
},
"engines": {

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/helper-plugin",
"version": "4.4.7",
"version": "4.5.0",
"description": "Helper for Strapi plugins development",
"repository": {
"type": "git",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/permissions",
"version": "4.4.7",
"version": "4.5.0",
"description": "Strapi's permission layer.",
"repository": {
"type": "git",
@ -25,7 +25,7 @@
},
"dependencies": {
"@casl/ability": "5.4.4",
"@strapi/utils": "4.4.7",
"@strapi/utils": "4.5.0",
"lodash": "4.17.21",
"sift": "16.0.0"
},

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/strapi",
"version": "4.4.7",
"version": "4.5.0",
"description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
"keywords": [
"strapi",
@ -80,18 +80,18 @@
"dependencies": {
"@koa/cors": "3.4.3",
"@koa/router": "10.1.1",
"@strapi/admin": "4.4.7",
"@strapi/database": "4.4.7",
"@strapi/generate-new": "4.4.7",
"@strapi/generators": "4.4.7",
"@strapi/logger": "4.4.7",
"@strapi/permissions": "4.4.7",
"@strapi/plugin-content-manager": "4.4.7",
"@strapi/plugin-content-type-builder": "4.4.7",
"@strapi/plugin-email": "4.4.7",
"@strapi/plugin-upload": "4.4.7",
"@strapi/typescript-utils": "4.4.7",
"@strapi/utils": "4.4.7",
"@strapi/admin": "4.5.0",
"@strapi/database": "4.5.0",
"@strapi/generate-new": "4.5.0",
"@strapi/generators": "4.5.0",
"@strapi/logger": "4.5.0",
"@strapi/permissions": "4.5.0",
"@strapi/plugin-content-manager": "4.5.0",
"@strapi/plugin-content-type-builder": "4.5.0",
"@strapi/plugin-email": "4.5.0",
"@strapi/plugin-upload": "4.5.0",
"@strapi/typescript-utils": "4.5.0",
"@strapi/utils": "4.5.0",
"bcryptjs": "2.4.3",
"boxen": "5.1.2",
"chalk": "4.1.2",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-upload",
"version": "4.4.7",
"version": "4.5.0",
"description": "Makes it easy to upload images and files to your Strapi Application.",
"license": "SEE LICENSE IN LICENSE",
"author": {
@ -23,9 +23,9 @@
"test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll"
},
"dependencies": {
"@strapi/helper-plugin": "4.4.7",
"@strapi/provider-upload-local": "4.4.7",
"@strapi/utils": "4.4.7",
"@strapi/helper-plugin": "4.5.0",
"@strapi/provider-upload-local": "4.5.0",
"@strapi/utils": "4.5.0",
"byte-size": "7.0.1",
"cropperjs": "1.5.12",
"date-fns": "2.29.2",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/utils",
"version": "4.4.7",
"version": "4.5.0",
"description": "Shared utilities for the Strapi packages",
"keywords": [
"strapi",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/generate-new",
"version": "4.4.7",
"version": "4.5.0",
"description": "Generate a new Strapi application.",
"keywords": [
"generate",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/generators",
"version": "4.4.7",
"version": "4.5.0",
"description": "Interactive API generator.",
"keywords": [
"strapi",
@ -30,8 +30,8 @@
"main": "lib/index.js",
"dependencies": {
"@sindresorhus/slugify": "1.1.0",
"@strapi/typescript-utils": "4.4.7",
"@strapi/utils": "4.4.7",
"@strapi/typescript-utils": "4.5.0",
"@strapi/utils": "4.5.0",
"chalk": "4.1.2",
"fs-extra": "10.0.0",
"node-plop": "0.26.3",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-color-picker",
"version": "4.4.7",
"version": "4.5.0",
"description": "Strapi maintained Custom Fields",
"strapi": {
"name": "color-picker",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-documentation",
"version": "4.4.7",
"version": "4.5.0",
"description": "Create an OpenAPI Document and visualize your API with SWAGGER UI.",
"repository": {
"type": "git",
@ -24,8 +24,8 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/helper-plugin": "4.4.7",
"@strapi/utils": "4.4.7",
"@strapi/helper-plugin": "4.5.0",
"@strapi/utils": "4.5.0",
"bcryptjs": "2.4.3",
"cheerio": "^1.0.0-rc.12",
"fs-extra": "10.0.0",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-graphql",
"version": "4.4.7",
"version": "4.5.0",
"description": "Adds GraphQL endpoint with default API methods.",
"repository": {
"type": "git",
@ -29,7 +29,7 @@
"dependencies": {
"@graphql-tools/schema": "8.1.2",
"@graphql-tools/utils": "^8.12.0",
"@strapi/utils": "4.4.7",
"@strapi/utils": "4.5.0",
"apollo-server-core": "3.1.2",
"apollo-server-koa": "3.10.0",
"glob": "^7.1.7",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-i18n",
"version": "4.4.7",
"version": "4.5.0",
"description": "This plugin enables to create, to read and to update content in different languages, both from the Admin Panel and from the API",
"repository": {
"type": "git",
@ -24,7 +24,7 @@
"test:unit": "jest --verbose"
},
"dependencies": {
"@strapi/utils": "4.4.7",
"@strapi/utils": "4.5.0",
"lodash": "4.17.21"
},
"devDependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-sentry",
"version": "4.4.7",
"version": "4.5.0",
"description": "Send Strapi error events to Sentry",
"repository": {
"type": "git",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/plugin-users-permissions",
"version": "4.4.7",
"version": "4.5.0",
"description": "Protect your API with a full-authentication process based on JWT",
"repository": {
"type": "git",
@ -27,8 +27,8 @@
"test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll"
},
"dependencies": {
"@strapi/helper-plugin": "4.4.7",
"@strapi/utils": "4.4.7",
"@strapi/helper-plugin": "4.5.0",
"@strapi/utils": "4.5.0",
"bcryptjs": "2.4.3",
"grant-koa": "5.4.8",
"jsonwebtoken": "^8.1.0",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-email-amazon-ses",
"version": "4.4.7",
"version": "4.5.0",
"description": "Amazon SES provider for strapi email",
"keywords": [
"email",
@ -36,7 +36,7 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/utils": "4.4.7",
"@strapi/utils": "4.5.0",
"node-ses": "^3.0.3"
},
"engines": {

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-email-mailgun",
"version": "4.4.7",
"version": "4.5.0",
"description": "Mailgun provider for strapi email plugin",
"keywords": [
"email",
@ -36,7 +36,7 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/utils": "4.4.7",
"@strapi/utils": "4.5.0",
"form-data": "^4.0.0",
"mailgun.js": "5.2.2"
},

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-email-nodemailer",
"version": "4.4.7",
"version": "4.5.0",
"description": "Nodemailer provider for Strapi 3",
"keywords": [
"strapi",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-email-sendgrid",
"version": "4.4.7",
"version": "4.5.0",
"description": "Sendgrid provider for strapi email",
"keywords": [
"email",
@ -37,7 +37,7 @@
},
"dependencies": {
"@sendgrid/mail": "7.7.0",
"@strapi/utils": "4.4.7"
"@strapi/utils": "4.5.0"
},
"engines": {
"node": ">=14.19.1 <=18.x.x",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-email-sendmail",
"version": "4.4.7",
"version": "4.5.0",
"description": "Sendmail provider for strapi email",
"keywords": [
"email",
@ -35,7 +35,7 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/utils": "4.4.7",
"@strapi/utils": "4.5.0",
"sendmail": "^1.6.1"
},
"engines": {

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-upload-aws-s3",
"version": "4.4.7",
"version": "4.5.0",
"description": "AWS S3 provider for strapi upload",
"keywords": [
"upload",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-upload-cloudinary",
"version": "4.4.7",
"version": "4.5.0",
"description": "Cloudinary provider for strapi upload",
"keywords": [
"upload",
@ -36,7 +36,7 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/utils": "4.4.7",
"@strapi/utils": "4.5.0",
"cloudinary": "^1.30.1",
"into-stream": "^5.1.0"
},

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/provider-upload-local",
"version": "4.4.7",
"version": "4.5.0",
"description": "Local provider for strapi upload",
"keywords": [
"upload",
@ -35,7 +35,7 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/utils": "4.4.7",
"@strapi/utils": "4.5.0",
"fs-extra": "10.0.0"
},
"engines": {

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/babel-plugin-switch-ee-ce",
"version": "4.4.7",
"version": "4.5.0",
"private": false,
"description": "Babel plugin to switch from CE to EE at runtime",
"repository": "git://github.com/strapi/strapi.git",

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/logger",
"version": "4.4.7",
"version": "4.5.0",
"description": "Strapi's logger",
"homepage": "https://strapi.io",
"bugs": {

View File

@ -1,6 +1,6 @@
{
"name": "@strapi/typescript-utils",
"version": "4.4.7",
"version": "4.5.0",
"description": "Typescript support for Strapi",
"keywords": [
"strapi",