diff --git a/.github/actions/check-pr-status/package.json b/.github/actions/check-pr-status/package.json index 370a4c4641..f27aa14cee 100644 --- 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": "4.4.7", + "version": "4.5.0", "main": "dist/index.js", "license": "MIT", "private": true, diff --git a/examples/getstarted/package.json b/examples/getstarted/package.json index 1f8f00820f..0339db4780 100644 --- a/examples/getstarted/package.json +++ b/examples/getstarted/package.json @@ -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", diff --git a/examples/kitchensink-ts/package.json b/examples/kitchensink-ts/package.json index ffc7db9fd3..a334e6c92a 100644 --- a/examples/kitchensink-ts/package.json +++ b/examples/kitchensink-ts/package.json @@ -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": { diff --git a/examples/kitchensink/package.json b/examples/kitchensink/package.json index 0364944299..b041718df3 100644 --- a/examples/kitchensink/package.json +++ b/examples/kitchensink/package.json @@ -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", diff --git a/lerna.json b/lerna.json index 8e52e147f0..70199a34b0 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "4.4.7", + "version": "4.5.0", "packages": [ "packages/*", "examples/*" diff --git a/packages/admin-test-utils/package.json b/packages/admin-test-utils/package.json index d850fd41b9..e1d85ab14f 100644 --- a/packages/admin-test-utils/package.json +++ b/packages/admin-test-utils/package.json @@ -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", diff --git a/packages/cli/create-strapi-app/package.json b/packages/cli/create-strapi-app/package.json index 80a0df9eed..621888a8fc 100644 --- a/packages/cli/create-strapi-app/package.json +++ b/packages/cli/create-strapi-app/package.json @@ -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" }, diff --git a/packages/cli/create-strapi-starter/package.json b/packages/cli/create-strapi-starter/package.json index 884ced47fb..2ce7394c70 100644 --- 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": "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", diff --git a/packages/core/admin/admin/src/StrapiApp.js b/packages/core/admin/admin/src/StrapiApp.js index 35a6c47b21..e3a2ffae37 100644 --- a/packages/core/admin/admin/src/StrapiApp.js +++ b/packages/core/admin/admin/src/StrapiApp.js @@ -10,8 +10,7 @@ import { basename, createHook } from './core/utils'; import configureStore from './core/store/configureStore'; import { customFields, Plugin } from './core/apis'; import App from './pages/App'; -import AuthLogo from './assets/images/logo_strapi_auth_v4.png'; -import MenuLogo from './assets/images/logo_strapi_menu.png'; +import Logo from './assets/images/logo-strapi-2022.svg'; import Providers from './components/Providers'; import languageNativeNames from './translations/languageNativeNames'; import { @@ -29,10 +28,10 @@ class StrapiApp { this.customConfigurations = adminConfig.config; this.customBootstrapConfiguration = adminConfig.bootstrap; this.configurations = { - authLogo: AuthLogo, + authLogo: Logo, head: { favicon }, locales: ['en'], - menuLogo: MenuLogo, + menuLogo: Logo, notifications: { releases: true }, themes: { light: lightTheme, dark: darkTheme }, translations: {}, diff --git a/packages/core/admin/admin/src/assets/images/homepage-logo.png b/packages/core/admin/admin/src/assets/images/homepage-logo.png deleted file mode 100644 index 870837b897..0000000000 Binary files a/packages/core/admin/admin/src/assets/images/homepage-logo.png and /dev/null differ diff --git a/packages/core/admin/admin/src/assets/images/icon_made-by-strapi.svg b/packages/core/admin/admin/src/assets/images/icon_made-by-strapi.svg deleted file mode 100644 index 1c7daa3a83..0000000000 --- a/packages/core/admin/admin/src/assets/images/icon_made-by-strapi.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packages/core/admin/admin/src/assets/images/icon_offline-cloud.svg b/packages/core/admin/admin/src/assets/images/icon_offline-cloud.svg index bed9d93484..dca54c111c 100644 --- a/packages/core/admin/admin/src/assets/images/icon_offline-cloud.svg +++ b/packages/core/admin/admin/src/assets/images/icon_offline-cloud.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/packages/core/admin/admin/src/assets/images/logo-strapi-2022.svg b/packages/core/admin/admin/src/assets/images/logo-strapi-2022.svg new file mode 100644 index 0000000000..4327af05cd --- /dev/null +++ b/packages/core/admin/admin/src/assets/images/logo-strapi-2022.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/packages/core/admin/admin/src/assets/images/logo_strapi_auth.png b/packages/core/admin/admin/src/assets/images/logo_strapi_auth.png deleted file mode 100644 index 75a1e3bd93..0000000000 Binary files a/packages/core/admin/admin/src/assets/images/logo_strapi_auth.png and /dev/null differ diff --git a/packages/core/admin/admin/src/assets/images/logo_strapi_auth_v4.png b/packages/core/admin/admin/src/assets/images/logo_strapi_auth_v4.png deleted file mode 100644 index e1cb05218a..0000000000 Binary files a/packages/core/admin/admin/src/assets/images/logo_strapi_auth_v4.png and /dev/null differ diff --git a/packages/core/admin/admin/src/assets/images/logo_strapi_menu.png b/packages/core/admin/admin/src/assets/images/logo_strapi_menu.png deleted file mode 100644 index 8ae6251bf0..0000000000 Binary files a/packages/core/admin/admin/src/assets/images/logo_strapi_menu.png and /dev/null differ diff --git a/packages/core/admin/admin/src/pages/HomePage/assets/corner-ornament.svg b/packages/core/admin/admin/src/pages/HomePage/assets/corner-ornament.svg new file mode 100644 index 0000000000..6c15fe002d --- /dev/null +++ b/packages/core/admin/admin/src/pages/HomePage/assets/corner-ornament.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/core/admin/admin/src/pages/HomePage/index.js b/packages/core/admin/admin/src/pages/HomePage/index.js index ae1448fdd8..e6ab63e382 100644 --- a/packages/core/admin/admin/src/pages/HomePage/index.js +++ b/packages/core/admin/admin/src/pages/HomePage/index.js @@ -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 = () => {
- + diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/index.js b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/index.js index 4d7b2e16e2..654b362e7a 100644 --- a/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/index.js +++ b/packages/core/admin/admin/src/pages/MarketplacePage/components/NpmPackageCard/index.js @@ -13,7 +13,7 @@ import { Tooltip } from '@strapi/design-system/Tooltip'; import ExternalLink from '@strapi/icons/ExternalLink'; import CheckCircle from '@strapi/icons/CheckCircle'; import { useTracking } from '@strapi/helper-plugin'; -import madeByStrapiIcon from '../../../../assets/images/icon_made-by-strapi.svg'; +import StrapiLogo from '../../../../assets/images/logo-strapi-2022.svg'; import InstallPluginButton from './InstallPluginButton'; import PackageStats from './PackageStats'; @@ -104,7 +104,7 @@ const NpmPackageCard = ({ =14.19.1 <=18.x.x", diff --git a/packages/providers/email-sendmail/package.json b/packages/providers/email-sendmail/package.json index dfa5110078..0c2d04d59e 100644 --- a/packages/providers/email-sendmail/package.json +++ b/packages/providers/email-sendmail/package.json @@ -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": { diff --git a/packages/providers/upload-aws-s3/package.json b/packages/providers/upload-aws-s3/package.json index 9fbf51cde5..41b330973b 100644 --- a/packages/providers/upload-aws-s3/package.json +++ b/packages/providers/upload-aws-s3/package.json @@ -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", diff --git a/packages/providers/upload-cloudinary/package.json b/packages/providers/upload-cloudinary/package.json index a9e4173d85..318be84222 100644 --- a/packages/providers/upload-cloudinary/package.json +++ b/packages/providers/upload-cloudinary/package.json @@ -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" }, diff --git a/packages/providers/upload-local/package.json b/packages/providers/upload-local/package.json index 7013329ca6..de8b6a4ada 100644 --- a/packages/providers/upload-local/package.json +++ b/packages/providers/upload-local/package.json @@ -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": { diff --git a/packages/utils/babel-plugin-switch-ee-ce/package.json b/packages/utils/babel-plugin-switch-ee-ce/package.json index ff597a79ac..a82d0b5ea4 100644 --- a/packages/utils/babel-plugin-switch-ee-ce/package.json +++ b/packages/utils/babel-plugin-switch-ee-ce/package.json @@ -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", diff --git a/packages/utils/logger/package.json b/packages/utils/logger/package.json index 097c6bafa1..81d21f211c 100644 --- a/packages/utils/logger/package.json +++ b/packages/utils/logger/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/logger", - "version": "4.4.7", + "version": "4.5.0", "description": "Strapi's logger", "homepage": "https://strapi.io", "bugs": { diff --git a/packages/utils/typescript/package.json b/packages/utils/typescript/package.json index 71d21934eb..d8e8eb2c1c 100644 --- a/packages/utils/typescript/package.json +++ b/packages/utils/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/typescript-utils", - "version": "4.4.7", + "version": "4.5.0", "description": "Typescript support for Strapi", "keywords": [ "strapi",