From 3f63902d4b471c4bafc571789970793783352bd8 Mon Sep 17 00:00:00 2001 From: Jorrit Schippers Date: Tue, 26 Jan 2021 17:06:25 +0100 Subject: [PATCH 01/18] Use https:// in package.json and README.md files (#9227) Signed-off-by: Jorrit Schippers --- CODE_OF_CONDUCT.md | 26 +++++++++---------- CONTRIBUTING.md | 4 +-- README.md | 4 +-- package.json | 4 +-- packages/create-strapi-app/package.json | 4 +-- packages/strapi-connector-bookshelf/README.md | 6 ++--- .../strapi-connector-bookshelf/package.json | 6 ++--- packages/strapi-connector-mongoose/README.md | 6 ++--- .../strapi-connector-mongoose/package.json | 6 ++--- packages/strapi-database/README.md | 8 +++--- packages/strapi-database/package.json | 4 +-- packages/strapi-generate-api/README.md | 6 ++--- packages/strapi-generate-api/package.json | 6 ++--- packages/strapi-generate-controller/README.md | 6 ++--- .../strapi-generate-controller/package.json | 6 ++--- packages/strapi-generate-model/README.md | 6 ++--- packages/strapi-generate-model/package.json | 6 ++--- packages/strapi-generate-new/README.md | 6 ++--- packages/strapi-generate-new/package.json | 6 ++--- packages/strapi-generate-plugin/README.md | 6 ++--- packages/strapi-generate-plugin/package.json | 6 ++--- packages/strapi-generate-policy/README.md | 6 ++--- packages/strapi-generate-policy/package.json | 6 ++--- packages/strapi-generate-service/README.md | 6 ++--- packages/strapi-generate-service/package.json | 6 ++--- packages/strapi-generate/README.md | 6 ++--- packages/strapi-generate/package.json | 6 ++--- .../src/components/BlockerComponent/index.js | 2 +- packages/strapi-helper-plugin/package.json | 4 +-- packages/strapi-hook-ejs/README.md | 6 ++--- packages/strapi-hook-ejs/package.json | 6 ++--- packages/strapi-hook-redis/README.md | 6 ++--- packages/strapi-hook-redis/package.json | 6 ++--- packages/strapi-middleware-views/README.md | 6 ++--- packages/strapi-middleware-views/package.json | 6 ++--- .../package.json | 4 +-- .../package.json | 4 +-- .../strapi-plugin-documentation/package.json | 4 +-- packages/strapi-plugin-email/package.json | 4 +-- .../package.json | 4 +-- .../README.md | 4 +-- .../package.json | 4 +-- .../strapi-provider-email-mailgun/README.md | 4 +-- .../package.json | 6 ++--- .../README.md | 4 +-- .../package.json | 4 +-- .../strapi-provider-email-sendgrid/README.md | 4 +-- .../package.json | 6 ++--- .../strapi-provider-email-sendmail/README.md | 4 +-- .../package.json | 6 ++--- .../strapi-provider-upload-aws-s3/README.md | 4 +-- .../package.json | 6 ++--- .../README.md | 4 +-- .../package.json | 4 +-- .../strapi-provider-upload-local/README.md | 4 +-- .../strapi-provider-upload-local/package.json | 6 ++--- .../README.md | 4 +-- packages/strapi-utils/README.md | 6 ++--- packages/strapi-utils/package.json | 6 ++--- packages/strapi/README.md | 6 ++--- packages/strapi/package.json | 6 ++--- 61 files changed, 169 insertions(+), 169 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 3087dd14ce..b07babdb2e 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo Examples of behavior that contributes to creating a positive environment include: -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members +- Using welcoming and inclusive language +- Being respectful of differing viewpoints and experiences +- Gracefully accepting constructive criticism +- Focusing on what is best for the community +- Showing empathy towards other community members Examples of unacceptable behavior by participants include: -* The use of sexualized language or imagery and unwelcome sexual attention or advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a professional setting +- The use of sexualized language or imagery and unwelcome sexual attention or advances +- Trolling, insulting/derogatory comments, and personal or political attacks +- Public or private harassment +- Publishing others' private information, such as a physical or electronic address, without explicit permission +- Other conduct which could reasonably be considered inappropriate in a professional setting ## Our Responsibilities @@ -40,7 +40,7 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai ## Attribution -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version] -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ +[homepage]: https://contributor-covenant.org +[version]: https://contributor-covenant.org/version/1/4/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b380727976..cd7ac0e93a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -152,7 +152,7 @@ $ node test/e2e.js --db=mysql ### Repository Organization -We chose to to use a monorepo design that exploits [Yarn Workspaces](https://yarnpkg.com/en/docs/workspaces) in the way [React](https://github.com/facebook/react/tree/master/packages) or [Babel](https://github.com/babel/babel/tree/master/packages) does. This allows the community to easily maintain the whole ecosystem, keep it up-to-date and consistent. +We chose to use a monorepo design that exploits [Yarn Workspaces](https://yarnpkg.com/en/docs/workspaces) in the way [React](https://github.com/facebook/react/tree/master/packages) or [Babel](https://github.com/babel/babel/tree/master/packages) does. This allows the community to easily maintain the whole ecosystem, keep it up-to-date and consistent. We do our best to keep the master branch as clean as possible, with tests passing at all times. However, it may happen that the master branch moves faster than the release cycle. Therefore check the [releases on npm](https://www.npmjs.com/package/strapi) so that you're always up-to-date with the latest stable version. @@ -163,7 +163,7 @@ Before submitting an issue you need to make sure: - You are experiencing a concrete technical issue with Strapi. - You have already searched for related [issues](https://github.com/strapi/strapi/issues), and found none open (if you found a related _closed_ issue, please link to it from your post). - You are not asking a question about how to use Strapi or about whether or not Strapi has a certain feature. For general help using Strapi, you may: - - Refer to [the official Strapi documentation](http://strapi.io). + - Refer to [the official Strapi documentation](https://strapi.io). - Ask a member of the community in the [Strapi Slack Community](https://slack.strapi.io/). - Ask a question on [our community forum](https://forum.strapi.io). - Your issue title is concise, on-topic and polite. diff --git a/README.md b/README.md index 2de969b477..b17a7f5d4e 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Travis Build Status - + Strapi on Slack

@@ -136,7 +136,7 @@ Please read our [Contributing Guide](./CONTRIBUTING.md) before submitting a Pull For general help using Strapi, please refer to [the official Strapi documentation](https://strapi.io/documentation/). For additional help, you can use one of these channels to ask a question: -- [Slack](http://slack.strapi.io) (For live discussion with the Community and Strapi team) +- [Slack](https://slack.strapi.io) (For live discussion with the Community and Strapi team) - [GitHub](https://github.com/strapi/strapi) (Bug reports, Contributions) - [Community Forum](https://forum.strapi.io) (Questions and Discussions) - [Academy](https://academy.strapi.io) (Learn the fundamentals of Strapi) diff --git a/package.json b/package.json index ab1838df44..34fa6bee82 100644 --- a/package.json +++ b/package.json @@ -82,13 +82,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi Solutions", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi Solutions", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/create-strapi-app/package.json b/packages/create-strapi-app/package.json index a9861a15aa..1285f46338 100644 --- a/packages/create-strapi-app/package.json +++ b/packages/create-strapi-app/package.json @@ -3,7 +3,7 @@ "version": "3.4.5", "description": "Generate a new Strapi application.", "license": "SEE LICENSE IN LICENSE", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "create-strapi-app", "create", @@ -29,7 +29,7 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "repository": { "type": "git", diff --git a/packages/strapi-connector-bookshelf/README.md b/packages/strapi-connector-bookshelf/README.md index a43dcf2f7a..ce6e8a76da 100644 --- a/packages/strapi-connector-bookshelf/README.md +++ b/packages/strapi-connector-bookshelf/README.md @@ -4,7 +4,7 @@ [![npm downloads](https://img.shields.io/npm/dm/strapi-connector-bookshelf.svg)](https://www.npmjs.org/package/strapi-connector-bookshelf) [![npm dependencies](https://david-dm.org/strapi/strapi-connector-bookshelf.svg)](https://david-dm.org/strapi/strapi-connector-bookshelf) [![Build status](https://travis-ci.org/strapi/strapi-connector-bookshelf.svg?branch=master)](https://travis-ci.org/strapi/strapi-connector-bookshelf) -[![Slack status](https://slack.strapi.io/badge.svg)](http://slack.strapi.io) +[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io) This built-in connector allows you to use the [Bookshelf ORM](http://bookshelfjs.org/) using the `strapi-connector-knex` connector. @@ -18,6 +18,6 @@ It is designed to work well with SQLite3, PostgreSQL, MySQL, MariaDB, Microsoft ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-connector-bookshelf/package.json b/packages/strapi-connector-bookshelf/package.json index 1c7810e97d..7c517b501e 100644 --- a/packages/strapi-connector-bookshelf/package.json +++ b/packages/strapi-connector-bookshelf/package.json @@ -2,7 +2,7 @@ "name": "strapi-connector-bookshelf", "version": "3.4.5", "description": "Bookshelf hook for the Strapi framework", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "bookshelf", "hook", @@ -39,13 +39,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-connector-mongoose/README.md b/packages/strapi-connector-mongoose/README.md index ea0c098b14..5a0b622362 100644 --- a/packages/strapi-connector-mongoose/README.md +++ b/packages/strapi-connector-mongoose/README.md @@ -4,7 +4,7 @@ [![npm downloads](https://img.shields.io/npm/dm/strapi-connector-mongoose.svg)](https://www.npmjs.org/package/strapi-connector-mongoose) [![npm dependencies](https://david-dm.org/strapi/strapi-connector-mongoose.svg)](https://david-dm.org/strapi/strapi-connector-mongoose) [![Build status](https://travis-ci.org/strapi/strapi-connector-mongoose.svg?branch=master)](https://travis-ci.org/strapi/strapi-connector-mongoose) -[![Slack status](https://slack.strapi.io/badge.svg)](http://slack.strapi.io) +[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io) This built-in connector allows you to use the [Mongoose ORM](http://mongoosejs.com/). @@ -16,6 +16,6 @@ This built-in connector allows you to use the [Mongoose ORM](http://mongoosejs.c ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-connector-mongoose/package.json b/packages/strapi-connector-mongoose/package.json index 349169c470..d2416bc554 100644 --- a/packages/strapi-connector-mongoose/package.json +++ b/packages/strapi-connector-mongoose/package.json @@ -2,7 +2,7 @@ "name": "strapi-connector-mongoose", "version": "3.4.5", "description": "Mongoose hook for the Strapi framework", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "mongoose", "hook", @@ -26,13 +26,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-database/README.md b/packages/strapi-database/README.md index fb137f8666..91c7c34e71 100644 --- a/packages/strapi-database/README.md +++ b/packages/strapi-database/README.md @@ -4,7 +4,7 @@ [![npm downloads](https://img.shields.io/npm/dm/strapi-database.svg)](https://www.npmjs.org/package/strapi-database) [![npm dependencies](https://david-dm.org/strapi/strapi-database.svg)](https://david-dm.org/strapi/strapi-database) [![Build status](https://travis-ci.org/strapi/strapi-database.svg?branch=master)](https://travis-ci.org/strapi/strapi-database) -[![Slack status](https://slack.strapi.io/badge.svg)](http://slack.strapi.io) +[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io) This package is strapi's database handling layer. It is responsible for orchestrating database connectors and implementing the logic of strapi's data structures. @@ -16,7 +16,7 @@ This package is not meant to be used as a standalone module. ## Links -- [Strapi documentation](http://strapi.io/documentation) -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi documentation](https://strapi.io/documentation) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-database/package.json b/packages/strapi-database/package.json index c069517eab..26cd8b5b43 100644 --- a/packages/strapi-database/package.json +++ b/packages/strapi-database/package.json @@ -2,7 +2,7 @@ "name": "strapi-database", "version": "3.4.5", "description": "Strapi's database layer", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "main": "./lib/index.js", "scripts": { "test": "echo \"no tests yet\"" @@ -13,7 +13,7 @@ "author": { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "repository": { "type": "git", diff --git a/packages/strapi-generate-api/README.md b/packages/strapi-generate-api/README.md index bad13fb7e2..3781ae6973 100644 --- a/packages/strapi-generate-api/README.md +++ b/packages/strapi-generate-api/README.md @@ -4,7 +4,7 @@ [![npm downloads](https://img.shields.io/npm/dm/strapi-generate-api.svg)](https://www.npmjs.org/package/strapi-generate-api) [![npm dependencies](https://david-dm.org/strapi/strapi-generate-api.svg)](https://david-dm.org/strapi/strapi-generate-api) [![Build status](https://travis-ci.org/strapi/strapi-generate-api.svg?branch=master)](https://travis-ci.org/strapi/strapi-generate-api) -[![Slack status](https://slack.strapi.io/badge.svg)](http://slack.strapi.io) +[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io) This Strapi generator contains all the default files for a new API. @@ -20,6 +20,6 @@ $ strapi generate:api apiName ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json index b8af4f162f..a70790985b 100644 --- a/packages/strapi-generate-api/package.json +++ b/packages/strapi-generate-api/package.json @@ -2,7 +2,7 @@ "name": "strapi-generate-api", "version": "3.4.5", "description": "Generate an API for a Strapi application.", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "generate", "generator", @@ -23,13 +23,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-generate-controller/README.md b/packages/strapi-generate-controller/README.md index 1aca0ae390..5f3737add8 100644 --- a/packages/strapi-generate-controller/README.md +++ b/packages/strapi-generate-controller/README.md @@ -4,7 +4,7 @@ [![npm downloads](https://img.shields.io/npm/dm/strapi-generate-controller.svg)](https://www.npmjs.org/package/strapi-generate-controller) [![npm dependencies](https://david-dm.org/strapi/strapi-generate-controller.svg)](https://david-dm.org/strapi/strapi-generate-controller) [![Build status](https://travis-ci.org/strapi/strapi-generate-controller.svg?branch=master)](https://travis-ci.org/strapi/strapi-generate-controller) -[![Slack status](https://slack.strapi.io/badge.svg)](http://slack.strapi.io) +[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io) This Strapi generator contains the default files for a controller. @@ -26,6 +26,6 @@ $ strapi generate:controller group user ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-generate-controller/package.json b/packages/strapi-generate-controller/package.json index ace56200c9..938eb0cfbf 100644 --- a/packages/strapi-generate-controller/package.json +++ b/packages/strapi-generate-controller/package.json @@ -2,7 +2,7 @@ "name": "strapi-generate-controller", "version": "3.4.5", "description": "Generate a controller for a Strapi API.", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "controller", "generate", @@ -23,13 +23,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-generate-model/README.md b/packages/strapi-generate-model/README.md index 646748be54..39a36505b7 100644 --- a/packages/strapi-generate-model/README.md +++ b/packages/strapi-generate-model/README.md @@ -4,7 +4,7 @@ [![npm downloads](https://img.shields.io/npm/dm/strapi-generate-model.svg)](https://www.npmjs.org/package/strapi-generate-model) [![npm dependencies](https://david-dm.org/strapi/strapi-generate-model.svg)](https://david-dm.org/strapi/strapi-generate-model) [![Build status](https://travis-ci.org/strapi/strapi-generate-model.svg?branch=master)](https://travis-ci.org/strapi/strapi-generate-model) -[![Slack status](https://slack.strapi.io/badge.svg)](http://slack.strapi.io) +[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io) This Strapi generator contains the default files for a model. @@ -26,6 +26,6 @@ $ strapi generate:model group user ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json index ca8bdbf41a..c3bcbbe190 100644 --- a/packages/strapi-generate-model/package.json +++ b/packages/strapi-generate-model/package.json @@ -2,7 +2,7 @@ "name": "strapi-generate-model", "version": "3.4.5", "description": "Generate a model for a Strapi API.", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "generate", "generator", @@ -24,13 +24,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-generate-new/README.md b/packages/strapi-generate-new/README.md index 2f7507fd18..6f870133d2 100644 --- a/packages/strapi-generate-new/README.md +++ b/packages/strapi-generate-new/README.md @@ -4,7 +4,7 @@ [![npm downloads](https://img.shields.io/npm/dm/strapi-generate-new.svg)](https://www.npmjs.org/package/strapi-generate-new) [![npm dependencies](https://david-dm.org/strapi/strapi-generate-new.svg)](https://david-dm.org/strapi/strapi-generate-new) [![Build status](https://travis-ci.org/strapi/strapi-generate-new.svg?branch=master)](https://travis-ci.org/strapi/strapi-generate-new) -[![Slack status](https://slack.strapi.io/badge.svg)](http://slack.strapi.io) +[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io) This Strapi generator contains all the default files for a new Strapi application. @@ -20,6 +20,6 @@ $ strapi new ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json index fa0a18e737..23f6d570cd 100644 --- a/packages/strapi-generate-new/package.json +++ b/packages/strapi-generate-new/package.json @@ -2,7 +2,7 @@ "name": "strapi-generate-new", "version": "3.4.5", "description": "Generate a new Strapi application.", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "generate", "generator", @@ -32,13 +32,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-generate-plugin/README.md b/packages/strapi-generate-plugin/README.md index f9d6706a3c..08dbf84cc7 100644 --- a/packages/strapi-generate-plugin/README.md +++ b/packages/strapi-generate-plugin/README.md @@ -4,7 +4,7 @@ [![npm downloads](https://img.shields.io/npm/dm/strapi-generate-plugin.svg)](https://www.npmjs.org/package/strapi-generate-plugin) [![npm dependencies](https://david-dm.org/strapi/strapi-generate-plugin.svg)](https://david-dm.org/strapi/strapi-generate-plugin) [![Build status](https://travis-ci.org/strapi/strapi-generate-plugin.svg?branch=master)](https://travis-ci.org/strapi/strapi-generate-plugin) -[![Slack status](https://slack.strapi.io/badge.svg)](http://slack.strapi.io) +[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io) This Strapi generator contains all the default files for a new plugin. @@ -20,6 +20,6 @@ $ strapi generate:plugin pluginName ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json index f0472fc895..4e6a3157cd 100644 --- a/packages/strapi-generate-plugin/package.json +++ b/packages/strapi-generate-plugin/package.json @@ -2,7 +2,7 @@ "name": "strapi-generate-plugin", "version": "3.4.5", "description": "Generate an plugin for a Strapi application.", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "generate", "generator", @@ -23,13 +23,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-generate-policy/README.md b/packages/strapi-generate-policy/README.md index db0a30486d..d538dd3265 100644 --- a/packages/strapi-generate-policy/README.md +++ b/packages/strapi-generate-policy/README.md @@ -4,7 +4,7 @@ [![npm downloads](https://img.shields.io/npm/dm/strapi-generate-policy.svg)](https://www.npmjs.org/package/strapi-generate-policy) [![npm dependencies](https://david-dm.org/strapi/strapi-generate-policy.svg)](https://david-dm.org/strapi/strapi-generate-policy) [![Build status](https://travis-ci.org/strapi/strapi-generate-policy.svg?branch=master)](https://travis-ci.org/strapi/strapi-generate-policy) -[![Slack status](https://slack.strapi.io/badge.svg)](http://slack.strapi.io) +[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io) This Strapi generator contains the default files for a policy. @@ -26,6 +26,6 @@ $ strapi generate:policy isAuthenticated user ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-generate-policy/package.json b/packages/strapi-generate-policy/package.json index 77febcd142..9cbc5be03f 100644 --- a/packages/strapi-generate-policy/package.json +++ b/packages/strapi-generate-policy/package.json @@ -2,7 +2,7 @@ "name": "strapi-generate-policy", "version": "3.4.5", "description": "Generate a policy for a Strapi API.", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "generate", "generator", @@ -23,13 +23,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-generate-service/README.md b/packages/strapi-generate-service/README.md index 21ac89a1a9..a6b1967faa 100644 --- a/packages/strapi-generate-service/README.md +++ b/packages/strapi-generate-service/README.md @@ -4,7 +4,7 @@ [![npm downloads](https://img.shields.io/npm/dm/strapi-generate-service.svg)](https://www.npmjs.org/package/strapi-generate-service) [![npm dependencies](https://david-dm.org/strapi/strapi-generate-service.svg)](https://david-dm.org/strapi/strapi-generate-service) [![Build status](https://travis-ci.org/strapi/strapi-generate-service.svg?branch=master)](https://travis-ci.org/strapi/strapi-generate-service) -[![Slack status](https://slack.strapi.io/badge.svg)](http://slack.strapi.io) +[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io) This Strapi generator contains the default files for a service. @@ -26,6 +26,6 @@ $ strapi generate:service sendEmail email ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-generate-service/package.json b/packages/strapi-generate-service/package.json index b3a4434a62..9e9703c0c8 100644 --- a/packages/strapi-generate-service/package.json +++ b/packages/strapi-generate-service/package.json @@ -2,7 +2,7 @@ "name": "strapi-generate-service", "version": "3.4.5", "description": "Generate a service for a Strapi API.", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "generate", "generator", @@ -23,13 +23,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-generate/README.md b/packages/strapi-generate/README.md index 0250bc79cf..1946bede6a 100644 --- a/packages/strapi-generate/README.md +++ b/packages/strapi-generate/README.md @@ -4,7 +4,7 @@ [![npm downloads](https://img.shields.io/npm/dm/strapi-generate.svg)](https://www.npmjs.org/package/strapi-generate) [![npm dependencies](https://david-dm.org/strapi/strapi-generate.svg)](https://david-dm.org/strapi/strapi-generate) [![Build status](https://travis-ci.org/strapi/strapi-generate.svg?branch=master)](https://travis-ci.org/strapi/strapi-generate) -[![Slack status](https://slack.strapi.io/badge.svg)](http://slack.strapi.io) +[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io) Master of ceremonies for generators in the Strapi CLI. @@ -20,6 +20,6 @@ $ strapi generate:something ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-generate/package.json b/packages/strapi-generate/package.json index 0c7a4521a4..a617e23134 100644 --- a/packages/strapi-generate/package.json +++ b/packages/strapi-generate/package.json @@ -2,7 +2,7 @@ "name": "strapi-generate", "version": "3.4.5", "description": "Master of ceremonies for the Strapi generators.", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "generate", "generator", @@ -25,13 +25,13 @@ "author": { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-helper-plugin/lib/src/components/BlockerComponent/index.js b/packages/strapi-helper-plugin/lib/src/components/BlockerComponent/index.js index 1d36b86167..d8b965402c 100644 --- a/packages/strapi-helper-plugin/lib/src/components/BlockerComponent/index.js +++ b/packages/strapi-helper-plugin/lib/src/components/BlockerComponent/index.js @@ -69,7 +69,7 @@ const renderButton = () => ( diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json index 492f4d70a8..8bca8c4a25 100644 --- a/packages/strapi-helper-plugin/package.json +++ b/packages/strapi-helper-plugin/package.json @@ -12,7 +12,7 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "main": "dist/strapi-helper-plugin.cjs.min.js", "module": "dist/strapi-helper-plugin.esm.min.js", @@ -20,7 +20,7 @@ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "license": "SEE LICENSE IN LICENSE", diff --git a/packages/strapi-hook-ejs/README.md b/packages/strapi-hook-ejs/README.md index cbf725b328..02b659fd20 100644 --- a/packages/strapi-hook-ejs/README.md +++ b/packages/strapi-hook-ejs/README.md @@ -4,7 +4,7 @@ [![npm downloads](https://img.shields.io/npm/dm/strapi-ejs.svg)](https://www.npmjs.org/package/strapi-ejs) [![npm dependencies](https://david-dm.org/strapi/strapi-ejs.svg)](https://david-dm.org/strapi/strapi-ejs) [![Build status](https://travis-ci.org/strapi/strapi-ejs.svg?branch=master)](https://travis-ci.org/strapi/strapi) -[![Slack status](https://slack.strapi.io/badge.svg)](http://slack.strapi.io) +[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io) This built-in hook allows you to use the EJS template engine with custom options. @@ -50,6 +50,6 @@ This will render the `views/home.ejs` file and you will have access to `<%= titl ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-hook-ejs/package.json b/packages/strapi-hook-ejs/package.json index 04852cc415..b8713a149c 100644 --- a/packages/strapi-hook-ejs/package.json +++ b/packages/strapi-hook-ejs/package.json @@ -2,7 +2,7 @@ "name": "strapi-hook-ejs", "version": "3.4.5", "description": "EJS hook for the Strapi framework", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "ejs", "hook", @@ -22,13 +22,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-hook-redis/README.md b/packages/strapi-hook-redis/README.md index 3263b4928e..3777e197fb 100644 --- a/packages/strapi-hook-redis/README.md +++ b/packages/strapi-hook-redis/README.md @@ -4,7 +4,7 @@ [![npm downloads](https://img.shields.io/npm/dm/strapi-redis.svg)](https://www.npmjs.org/package/strapi-redis) [![npm dependencies](https://david-dm.org/strapi/strapi-redis.svg)](https://david-dm.org/strapi/strapi-redis) [![Build status](https://travis-ci.org/strapi/strapi-redis.svg?branch=master)](https://travis-ci.org/strapi/strapi-redis) -[![Slack status](https://slack.strapi.io/badge.svg)](http://slack.strapi.io) +[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io) This built-in hook allows you to use [Redis](https://redis.io/) as a databases connection. Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker. @@ -18,6 +18,6 @@ We developed this hook to use Redis as cache database for our Strapi apps. ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-hook-redis/package.json b/packages/strapi-hook-redis/package.json index 5ad478697e..302cbed4c2 100644 --- a/packages/strapi-hook-redis/package.json +++ b/packages/strapi-hook-redis/package.json @@ -2,7 +2,7 @@ "name": "strapi-hook-redis", "version": "3.4.5", "description": "Redis hook for the Strapi framework", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "redis", "hook", @@ -24,13 +24,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-middleware-views/README.md b/packages/strapi-middleware-views/README.md index 41565b6bef..d48af6c910 100644 --- a/packages/strapi-middleware-views/README.md +++ b/packages/strapi-middleware-views/README.md @@ -4,7 +4,7 @@ [![npm downloads](https://img.shields.io/npm/dm/strapi-middleware-views.svg)](https://www.npmjs.org/package/strapi-middleware-views) [![npm dependencies](https://david-dm.org/strapi/strapi-middleware-views.svg)](https://david-dm.org/strapi/strapi-middleware-views) [![Build status](https://travis-ci.org/strapi/strapi-middleware-views.svg?branch=master)](https://travis-ci.org/strapi/strapi-middleware-views) -[![Slack status](https://slack.strapi.io/badge.svg)](http://slack.strapi.io) +[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io) Views middleware to enable server-side rendering for the Strapi framework. It will let you use [koa-views](https://www.npmjs.com/package/koa-views) and [consolidate](https://github.com/tj/consolidate.js/). @@ -14,6 +14,6 @@ Views middleware to enable server-side rendering for the Strapi framework. It wi ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-middleware-views/package.json b/packages/strapi-middleware-views/package.json index dc44fefb11..65b9165ba6 100644 --- a/packages/strapi-middleware-views/package.json +++ b/packages/strapi-middleware-views/package.json @@ -2,7 +2,7 @@ "name": "strapi-middleware-views", "version": "3.4.5", "description": "Views middleware to enable server-side rendering for the Strapi framework", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "redis", "hook", @@ -22,13 +22,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json index e387b5b4f9..10fc59b6ac 100644 --- a/packages/strapi-plugin-content-manager/package.json +++ b/packages/strapi-plugin-content-manager/package.json @@ -53,13 +53,13 @@ "author": { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json index 0a9b1eabae..3dcc1e5082 100644 --- a/packages/strapi-plugin-content-type-builder/package.json +++ b/packages/strapi-plugin-content-type-builder/package.json @@ -38,13 +38,13 @@ "author": { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-plugin-documentation/package.json b/packages/strapi-plugin-documentation/package.json index fcfcfced73..dec6a2d5fa 100644 --- a/packages/strapi-plugin-documentation/package.json +++ b/packages/strapi-plugin-documentation/package.json @@ -41,13 +41,13 @@ "author": { "name": "soupette", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" }, { "name": "soupette", diff --git a/packages/strapi-plugin-email/package.json b/packages/strapi-plugin-email/package.json index cb0e03783d..30e318fbd8 100644 --- a/packages/strapi-plugin-email/package.json +++ b/packages/strapi-plugin-email/package.json @@ -23,13 +23,13 @@ "author": { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json index 8739a78e37..221a1b9656 100644 --- a/packages/strapi-plugin-users-permissions/package.json +++ b/packages/strapi-plugin-users-permissions/package.json @@ -45,13 +45,13 @@ "author": { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-provider-email-amazon-ses/README.md b/packages/strapi-provider-email-amazon-ses/README.md index 92ba2c89b7..eacf35005e 100644 --- a/packages/strapi-provider-email-amazon-ses/README.md +++ b/packages/strapi-provider-email-amazon-ses/README.md @@ -6,8 +6,8 @@ ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) ## Prerequisites diff --git a/packages/strapi-provider-email-amazon-ses/package.json b/packages/strapi-provider-email-amazon-ses/package.json index 995d49da18..4e1868a148 100644 --- a/packages/strapi-provider-email-amazon-ses/package.json +++ b/packages/strapi-provider-email-amazon-ses/package.json @@ -2,7 +2,7 @@ "name": "strapi-provider-email-amazon-ses", "version": "3.4.5", "description": "Amazon SES provider for strapi email", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "email", "strapi", @@ -25,7 +25,7 @@ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-provider-email-mailgun/README.md b/packages/strapi-provider-email-mailgun/README.md index d45f350c38..caa5edc587 100644 --- a/packages/strapi-provider-email-mailgun/README.md +++ b/packages/strapi-provider-email-mailgun/README.md @@ -6,8 +6,8 @@ ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) ## Prerequisites diff --git a/packages/strapi-provider-email-mailgun/package.json b/packages/strapi-provider-email-mailgun/package.json index 3edf118644..38386cb9c6 100644 --- a/packages/strapi-provider-email-mailgun/package.json +++ b/packages/strapi-provider-email-mailgun/package.json @@ -2,7 +2,7 @@ "name": "strapi-provider-email-mailgun", "version": "3.4.5", "description": "Mailgun provider for strapi email plugin", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "email", "strapi", @@ -22,13 +22,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-provider-email-nodemailer/README.md b/packages/strapi-provider-email-nodemailer/README.md index 8ad48b6078..3d229cf036 100644 --- a/packages/strapi-provider-email-nodemailer/README.md +++ b/packages/strapi-provider-email-nodemailer/README.md @@ -6,8 +6,8 @@ ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) ## Prerequisites diff --git a/packages/strapi-provider-email-nodemailer/package.json b/packages/strapi-provider-email-nodemailer/package.json index 64d7cc6968..8d33dd7a3d 100644 --- a/packages/strapi-provider-email-nodemailer/package.json +++ b/packages/strapi-provider-email-nodemailer/package.json @@ -2,7 +2,7 @@ "name": "strapi-provider-email-nodemailer", "version": "3.4.5", "description": "Nodemailer provider for Strapi 3", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "strapi", "email", @@ -48,7 +48,7 @@ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "license": "SEE LICENSE IN LICENSE", diff --git a/packages/strapi-provider-email-sendgrid/README.md b/packages/strapi-provider-email-sendgrid/README.md index 7667e045fc..1524223a0a 100644 --- a/packages/strapi-provider-email-sendgrid/README.md +++ b/packages/strapi-provider-email-sendgrid/README.md @@ -6,8 +6,8 @@ ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) ## Prerequisites diff --git a/packages/strapi-provider-email-sendgrid/package.json b/packages/strapi-provider-email-sendgrid/package.json index 57b028fb64..b4459964b1 100644 --- a/packages/strapi-provider-email-sendgrid/package.json +++ b/packages/strapi-provider-email-sendgrid/package.json @@ -2,7 +2,7 @@ "name": "strapi-provider-email-sendgrid", "version": "3.4.5", "description": "Sendgrid provider for strapi email", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "email", "strapi", @@ -22,13 +22,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-provider-email-sendmail/README.md b/packages/strapi-provider-email-sendmail/README.md index 3bae81f39c..34e6502500 100644 --- a/packages/strapi-provider-email-sendmail/README.md +++ b/packages/strapi-provider-email-sendmail/README.md @@ -6,8 +6,8 @@ ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) ## Prerequisites diff --git a/packages/strapi-provider-email-sendmail/package.json b/packages/strapi-provider-email-sendmail/package.json index a1fea121b2..828bd0ca46 100644 --- a/packages/strapi-provider-email-sendmail/package.json +++ b/packages/strapi-provider-email-sendmail/package.json @@ -2,7 +2,7 @@ "name": "strapi-provider-email-sendmail", "version": "3.4.5", "description": "Sendmail provider for strapi email", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "email", "strapi" @@ -21,13 +21,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-provider-upload-aws-s3/README.md b/packages/strapi-provider-upload-aws-s3/README.md index 9225a96243..6485242496 100644 --- a/packages/strapi-provider-upload-aws-s3/README.md +++ b/packages/strapi-provider-upload-aws-s3/README.md @@ -34,6 +34,6 @@ module.exports = ({ env }) => ({ ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-provider-upload-aws-s3/package.json b/packages/strapi-provider-upload-aws-s3/package.json index 58b610f01a..0e88298509 100644 --- a/packages/strapi-provider-upload-aws-s3/package.json +++ b/packages/strapi-provider-upload-aws-s3/package.json @@ -2,7 +2,7 @@ "name": "strapi-provider-upload-aws-s3", "version": "3.4.5", "description": "AWS S3 provider for strapi upload", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "upload", "aws", @@ -23,13 +23,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-provider-upload-cloudinary/README.md b/packages/strapi-provider-upload-cloudinary/README.md index 76c051f8bc..165a793ca3 100644 --- a/packages/strapi-provider-upload-cloudinary/README.md +++ b/packages/strapi-provider-upload-cloudinary/README.md @@ -31,6 +31,6 @@ module.exports = ({ env }) => ({ ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-provider-upload-cloudinary/package.json b/packages/strapi-provider-upload-cloudinary/package.json index 226eeb5623..7f4f229b5f 100644 --- a/packages/strapi-provider-upload-cloudinary/package.json +++ b/packages/strapi-provider-upload-cloudinary/package.json @@ -2,7 +2,7 @@ "name": "strapi-provider-upload-cloudinary", "version": "3.4.5", "description": "Cloudinary provider for strapi upload", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "upload", "cloudinary", @@ -31,7 +31,7 @@ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-provider-upload-local/README.md b/packages/strapi-provider-upload-local/README.md index e2dfa25c99..c6a9123ab8 100644 --- a/packages/strapi-provider-upload-local/README.md +++ b/packages/strapi-provider-upload-local/README.md @@ -25,6 +25,6 @@ The `sizeLimit` parameter must be a number. Be aware that the unit is in bytes, ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-provider-upload-local/package.json b/packages/strapi-provider-upload-local/package.json index a642008aa1..6ab7b2265b 100644 --- a/packages/strapi-provider-upload-local/package.json +++ b/packages/strapi-provider-upload-local/package.json @@ -2,7 +2,7 @@ "name": "strapi-provider-upload-local", "version": "3.4.5", "description": "Local provider for strapi upload", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "upload", "strapi" @@ -17,13 +17,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi-provider-upload-rackspace/README.md b/packages/strapi-provider-upload-rackspace/README.md index 7086c4ff5c..1278caee7d 100644 --- a/packages/strapi-provider-upload-rackspace/README.md +++ b/packages/strapi-provider-upload-rackspace/README.md @@ -32,6 +32,6 @@ module.exports = ({ env }) => ({ ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-utils/README.md b/packages/strapi-utils/README.md index dd5aaacdd8..fdbd964001 100644 --- a/packages/strapi-utils/README.md +++ b/packages/strapi-utils/README.md @@ -4,7 +4,7 @@ [![npm downloads](https://img.shields.io/npm/dm/strapi-utils.svg)](https://www.npmjs.org/package/strapi-utils) [![npm dependencies](https://david-dm.org/strapi/strapi-utils.svg)](https://david-dm.org/strapi/strapi-utils) [![Build status](https://travis-ci.org/strapi/strapi-utils.svg?branch=master)](https://travis-ci.org/strapi/strapi-utils) -[![Slack status](https://slack.strapi.io/badge.svg)](http://slack.strapi.io) +[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io) Shared utilities between Strapi packages. @@ -14,6 +14,6 @@ Shared utilities between Strapi packages. ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-utils/package.json b/packages/strapi-utils/package.json index 074051f8e5..02989420a6 100644 --- a/packages/strapi-utils/package.json +++ b/packages/strapi-utils/package.json @@ -2,7 +2,7 @@ "name": "strapi-utils", "version": "3.4.5", "description": "Shared utilities for the Strapi packages", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "keywords": [ "strapi", "utilities", @@ -24,13 +24,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { diff --git a/packages/strapi/README.md b/packages/strapi/README.md index eca009ac6e..de6c609b10 100644 --- a/packages/strapi/README.md +++ b/packages/strapi/README.md @@ -4,7 +4,7 @@ [![npm downloads](https://img.shields.io/npm/dm/strapi.svg)](https://www.npmjs.org/package/strapi) [![npm dependencies](https://david-dm.org/strapi/strapi.svg)](https://david-dm.org/strapi/strapi) [![Build status](https://travis-ci.org/strapi/strapi.svg?branch=master)](https://travis-ci.org/strapi/strapi) -[![Slack status](https://slack.strapi.io/badge.svg)](http://slack.strapi.io) +[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io) The Strapi HTTP layer sits on top of [Koa](http://koajs.com/). Its ensemble of small modules work together to provide simplicity, maintainability, and structural conventions to Node.js applications. @@ -14,6 +14,6 @@ The Strapi HTTP layer sits on top of [Koa](http://koajs.com/). Its ensemble of s ## Links -- [Strapi website](http://strapi.io/) -- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi website](https://strapi.io/) +- [Strapi community on Slack](https://slack.strapi.io) - [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi/package.json b/packages/strapi/package.json index 2eb467513b..f56d26eb51 100644 --- a/packages/strapi/package.json +++ b/packages/strapi/package.json @@ -2,7 +2,7 @@ "name": "strapi", "version": "3.4.5", "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: MongoDB, MySQL, MariaDB, PostgreSQL, SQLite", - "homepage": "http://strapi.io", + "homepage": "https://strapi.io", "directories": { "lib": "./lib", "bin": "./bin" @@ -72,13 +72,13 @@ "author": { "email": "hi@strapi.io", "name": "Strapi team", - "url": "http://strapi.io" + "url": "https://strapi.io" }, "maintainers": [ { "name": "Strapi team", "email": "hi@strapi.io", - "url": "http://strapi.io" + "url": "https://strapi.io" } ], "repository": { From 47edbcbfb01374b0f17dfb223570842659c78ba8 Mon Sep 17 00:00:00 2001 From: soupette Date: Wed, 27 Jan 2021 15:42:18 +0100 Subject: [PATCH 02/18] Fixes #9236 Signed-off-by: soupette --- .../EditViewDataManagerProvider/utils/schema.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/utils/schema.js b/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/utils/schema.js index 4ecde2d6ae..0820716a8a 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/utils/schema.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/utils/schema.js @@ -212,13 +212,6 @@ const createYupSchema = ( const createYupSchemaAttribute = (type, validations, options) => { let schema = yup.mixed(); - let regex = get(validations, 'regex', null); - delete validations.regex; - - if (regex) { - validations.regex = new RegExp(regex); - } - if (['string', 'uid', 'text', 'richtext', 'email', 'password', 'enumeration'].includes(type)) { schema = yup.string(); } @@ -341,7 +334,7 @@ const createYupSchemaAttribute = (type, validations, options) => { break; } case 'regex': - schema = schema.matches(validationValue, errorsTrads.regex); + schema = schema.matches(new RegExp(validationValue), errorsTrads.regex); break; case 'lowercase': if (['text', 'textarea', 'email', 'string'].includes(type)) { From e7894779ce3046797371579bdef1b6d5bc0352fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Jan 2021 09:50:17 +0100 Subject: [PATCH 03/18] Bump react-select from 3.2.0 to 4.0.2 (#9244) Bumps [react-select](https://github.com/JedWatson/react-select) from 3.2.0 to 4.0.2. - [Release notes](https://github.com/JedWatson/react-select/releases) - [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.2.0...react-select@4.0.2) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/strapi-admin/package.json | 2 +- yarn.lock | 172 ++++++++++++++++------------- 2 files changed, 96 insertions(+), 78 deletions(-) diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json index 0c624ff5dc..12b7e97646 100644 --- a/packages/strapi-admin/package.json +++ b/packages/strapi-admin/package.json @@ -85,7 +85,7 @@ "react-redux": "7.2.0", "react-router": "^5.0.0", "react-router-dom": "^5.0.0", - "react-select": "^3.2.0", + "react-select": "^4.0.2", "react-transition-group": "4.4.1", "react-virtualized": "^9.21.2", "reactstrap": "8.4.1", diff --git a/yarn.lock b/yarn.lock index 54f05447d0..e4f562d069 100644 --- a/yarn.lock +++ b/yarn.lock @@ -222,7 +222,7 @@ dependencies: "@babel/types" "^7.10.4" -"@babel/helper-module-imports@^7.12.1": +"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.7.0": version "7.12.5" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb" integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA== @@ -514,6 +514,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" +"@babel/plugin-syntax-jsx@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926" + integrity sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" @@ -1126,38 +1133,47 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@emotion/cache@^10.0.27", "@emotion/cache@^10.0.9": - version "10.0.29" - resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0" - integrity sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ== +"@emotion/babel-plugin@^11.0.0": + version "11.1.2" + resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.1.2.tgz#68fe1aa3130099161036858c64ee92056c6730b7" + integrity sha512-Nz1k7b11dWw8Nw4Z1R99A9mlB6C6rRsCtZnwNUOj4NsoZdrO2f2A/83ST7htJORD5zpOiLKY59aJN23092949w== dependencies: - "@emotion/sheet" "0.9.4" - "@emotion/stylis" "0.8.5" - "@emotion/utils" "0.11.3" - "@emotion/weak-memoize" "0.2.5" + "@babel/helper-module-imports" "^7.7.0" + "@babel/plugin-syntax-jsx" "^7.12.1" + "@babel/runtime" "^7.7.2" + "@emotion/hash" "^0.8.0" + "@emotion/memoize" "^0.7.5" + "@emotion/serialize" "^1.0.0" + babel-plugin-macros "^2.6.1" + convert-source-map "^1.5.0" + escape-string-regexp "^4.0.0" + find-root "^1.1.0" + source-map "^0.5.7" + stylis "^4.0.3" -"@emotion/core@^10.0.9": - version "10.0.35" - resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.35.tgz#513fcf2e22cd4dfe9d3894ed138c9d7a859af9b3" - integrity sha512-sH++vJCdk025fBlRZSAhkRlSUoqSqgCzYf5fMOmqqi3bM6how+sQpg3hkgJonj8GxXM4WbD7dRO+4tegDB9fUw== +"@emotion/cache@^11.0.0", "@emotion/cache@^11.1.3": + version "11.1.3" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.1.3.tgz#c7683a9484bcd38d5562f2b9947873cf66829afd" + integrity sha512-n4OWinUPJVaP6fXxWZD9OUeQ0lY7DvtmtSuqtRWT0Ofo/sBLCVSgb4/Oa0Q5eFxcwablRKjUXqXtNZVyEwCAuA== dependencies: - "@babel/runtime" "^7.5.5" - "@emotion/cache" "^10.0.27" - "@emotion/css" "^10.0.27" - "@emotion/serialize" "^0.11.15" - "@emotion/sheet" "0.9.4" - "@emotion/utils" "0.11.3" + "@emotion/memoize" "^0.7.4" + "@emotion/sheet" "^1.0.0" + "@emotion/utils" "^1.0.0" + "@emotion/weak-memoize" "^0.2.5" + stylis "^4.0.3" -"@emotion/css@^10.0.27", "@emotion/css@^10.0.9": - version "10.0.27" - resolved "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.27.tgz#3a7458198fbbebb53b01b2b87f64e5e21241e14c" - integrity sha512-6wZjsvYeBhyZQYNrGoR5yPMYbMBNEnanDrqmsqS1mzDm1cOTu12shvl2j4QHNS36UaTE0USIJawCH9C8oW34Zw== +"@emotion/css@^11.0.0": + version "11.1.3" + resolved "https://registry.yarnpkg.com/@emotion/css/-/css-11.1.3.tgz#9ed44478b19e5d281ccbbd46d74d123d59be793f" + integrity sha512-RSQP59qtCNTf5NWD6xM08xsQdCZmVYnX/panPYvB6LQAPKQB6GL49Njf0EMbS3CyDtrlWsBcmqBtysFvfWT3rA== dependencies: - "@emotion/serialize" "^0.11.15" - "@emotion/utils" "0.11.3" - babel-plugin-emotion "^10.0.27" + "@emotion/babel-plugin" "^11.0.0" + "@emotion/cache" "^11.1.3" + "@emotion/serialize" "^1.0.0" + "@emotion/sheet" "^1.0.0" + "@emotion/utils" "^1.0.0" -"@emotion/hash@0.8.0": +"@emotion/hash@^0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== @@ -1174,38 +1190,56 @@ resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== -"@emotion/serialize@^0.11.15", "@emotion/serialize@^0.11.16": - version "0.11.16" - resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.16.tgz#dee05f9e96ad2fb25a5206b6d759b2d1ed3379ad" - integrity sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg== +"@emotion/memoize@^0.7.4", "@emotion/memoize@^0.7.5": + version "0.7.5" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50" + integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ== + +"@emotion/react@^11.1.1": + version "11.1.4" + resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.1.4.tgz#ddee4247627ff7dd7d0c6ae52f1cfd6b420357d2" + integrity sha512-9gkhrW8UjV4IGRnEe4/aGPkUxoGS23aD9Vu6JCGfEDyBYL+nGkkRBoMFGAzCT9qFdyUvQp4UUtErbKWxq/JS4A== dependencies: - "@emotion/hash" "0.8.0" - "@emotion/memoize" "0.7.4" - "@emotion/unitless" "0.7.5" - "@emotion/utils" "0.11.3" - csstype "^2.5.7" + "@babel/runtime" "^7.7.2" + "@emotion/cache" "^11.1.3" + "@emotion/serialize" "^1.0.0" + "@emotion/sheet" "^1.0.1" + "@emotion/utils" "^1.0.0" + "@emotion/weak-memoize" "^0.2.5" + hoist-non-react-statics "^3.3.1" -"@emotion/sheet@0.9.4": - version "0.9.4" - resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.4.tgz#894374bea39ec30f489bbfc3438192b9774d32e5" - integrity sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA== +"@emotion/serialize@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.0.tgz#1a61f4f037cf39995c97fc80ebe99abc7b191ca9" + integrity sha512-zt1gm4rhdo5Sry8QpCOpopIUIKU+mUSpV9WNmFILUraatm5dttNEaYzUWWSboSMUE6PtN2j1cAsuvcugfdI3mw== + dependencies: + "@emotion/hash" "^0.8.0" + "@emotion/memoize" "^0.7.4" + "@emotion/unitless" "^0.7.5" + "@emotion/utils" "^1.0.0" + csstype "^3.0.2" -"@emotion/stylis@0.8.5", "@emotion/stylis@^0.8.4": +"@emotion/sheet@^1.0.0", "@emotion/sheet@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698" + integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g== + +"@emotion/stylis@^0.8.4": version "0.8.5" resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04" integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ== -"@emotion/unitless@0.7.5", "@emotion/unitless@^0.7.4": +"@emotion/unitless@^0.7.4", "@emotion/unitless@^0.7.5": version "0.7.5" resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== -"@emotion/utils@0.11.3": - version "0.11.3" - resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.3.tgz#a759863867befa7e583400d322652a3f44820924" - integrity sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw== +"@emotion/utils@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af" + integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA== -"@emotion/weak-memoize@0.2.5": +"@emotion/weak-memoize@^0.2.5": version "0.2.5" resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46" integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA== @@ -4548,22 +4582,6 @@ babel-plugin-dynamic-import-node@^2.3.3: dependencies: object.assign "^4.1.0" -babel-plugin-emotion@^10.0.27: - version "10.0.33" - resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.33.tgz#ce1155dcd1783bbb9286051efee53f4e2be63e03" - integrity sha512-bxZbTTGz0AJQDHm8k6Rf3RQJ8tX2scsfsRyKVgAbiUPUNIRtlK+7JxP+TAd1kRLABFxe0CFm2VdK4ePkoA9FxQ== - dependencies: - "@babel/helper-module-imports" "^7.0.0" - "@emotion/hash" "0.8.0" - "@emotion/memoize" "0.7.4" - "@emotion/serialize" "^0.11.16" - babel-plugin-macros "^2.0.0" - babel-plugin-syntax-jsx "^6.18.0" - convert-source-map "^1.5.0" - escape-string-regexp "^1.0.5" - find-root "^1.1.0" - source-map "^0.5.7" - babel-plugin-istanbul@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" @@ -4585,7 +4603,7 @@ babel-plugin-jest-hoist@^26.6.2: "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" -babel-plugin-macros@^2.0.0: +babel-plugin-macros@^2.6.1: version "2.8.0" resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg== @@ -6578,11 +6596,6 @@ cssstyle@^2.2.0: dependencies: cssom "~0.3.6" -csstype@^2.5.7: - version "2.6.13" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz#a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f" - integrity sha512-ul26pfSQTZW8dcOnD2iiJssfXw0gdNVX9IJDH/X3K5DGPfj+fUYe3kB+swUY6BF3oZDxaID3AJt+9/ojSAE05A== - csstype@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.3.tgz#2b410bbeba38ba9633353aff34b05d9755d065f8" @@ -9523,7 +9536,7 @@ hoek@6.x.x: resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c" integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ== -hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.2.1, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: +hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.2.1, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -15921,15 +15934,15 @@ react-router@^5.0.0: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react-select@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.2.0.tgz#de9284700196f5f9b5277c5d850a9ce85f5c72fe" - integrity sha512-B/q3TnCZXEKItO0fFN/I0tWOX3WJvi/X2wtdffmwSQVRwg5BpValScTO1vdic9AxlUgmeSzib2hAZAwIUQUZGQ== +react-select@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/react-select/-/react-select-4.0.2.tgz#4dcca9f38d6a41e01f2dc7673e244a325e3b4e0e" + integrity sha512-BiihrRpRIBBvNqofNZIBpo08Kw8DBHb/kgpIDW4bxgkttk50Sxf0alEIKobns3U7UJXk/CA4rsFUueQEg9Pm5A== dependencies: "@babel/runtime" "^7.4.4" - "@emotion/cache" "^10.0.9" - "@emotion/core" "^10.0.9" - "@emotion/css" "^10.0.9" + "@emotion/cache" "^11.0.0" + "@emotion/css" "^11.0.0" + "@emotion/react" "^11.1.1" memoize-one "^5.0.0" prop-types "^15.6.0" react-input-autosize "^3.0.0" @@ -18591,6 +18604,11 @@ stylelint@10.1.0: svg-tags "^1.0.0" table "^5.2.3" +stylis@^4.0.3: + version "4.0.6" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.6.tgz#0d8b97b6bc4748bea46f68602b6df27641b3c548" + integrity sha512-1igcUEmYFBEO14uQHAJhCUelTR5jPztfdVKrYxRnDa5D5Dn3w0NxXupJNPr/VV/yRfZYEAco8sTIRZzH3sRYKg== + subscriptions-transport-ws@^0.9.11: version "0.9.18" resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.18.tgz#bcf02320c911fbadb054f7f928e51c6041a37b97" From b77b0644b9b975a47fd0430dff18b9b0dd5c2f94 Mon Sep 17 00:00:00 2001 From: Bobby Glidwell Date: Thu, 28 Jan 2021 04:24:11 -0600 Subject: [PATCH 04/18] add support for actionOptions for provider upload and delete functions (#9219) * add config.options to upload and delete functions Supports options object in providerOptions which can contain any cloudinary upload/delete options * add actionOptions to upload object and createProvider function used to initialize upload/delete custom options which can be passed to a provider's upload/delete function * Update README.md added actionOptions description with link to available cloudinary upload/delete options * wrapFunctionForErrors for upload and delete * make actionOptions {} by default --- packages/strapi-plugin-upload/config/config.json | 3 ++- .../strapi-plugin-upload/config/functions/bootstrap.js | 10 +++++++--- packages/strapi-provider-upload-cloudinary/README.md | 6 ++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/packages/strapi-plugin-upload/config/config.json b/packages/strapi-plugin-upload/config/config.json index 79e49e372a..90f4db444f 100644 --- a/packages/strapi-plugin-upload/config/config.json +++ b/packages/strapi-plugin-upload/config/config.json @@ -3,5 +3,6 @@ "provider": "local", "providerOptions": { "sizeLimit": 1000000 - } + }, + "actionOptions": {} } diff --git a/packages/strapi-plugin-upload/config/functions/bootstrap.js b/packages/strapi-plugin-upload/config/functions/bootstrap.js index f80ceb6e32..d567e5c9bb 100644 --- a/packages/strapi-plugin-upload/config/functions/bootstrap.js +++ b/packages/strapi-plugin-upload/config/functions/bootstrap.js @@ -36,14 +36,18 @@ const wrapFunctionForErrors = fn => async (...args) => { } }; -const createProvider = ({ provider, providerOptions }) => { +const createProvider = ({ provider, providerOptions, actionOptions = {} }) => { try { const providerInstance = require(`strapi-provider-upload-${provider}`).init(providerOptions); return Object.assign(Object.create(baseProvider), { ...providerInstance, - upload: wrapFunctionForErrors(providerInstance.upload.bind(providerInstance)), - delete: wrapFunctionForErrors(providerInstance.delete.bind(providerInstance)), + upload: wrapFunctionForErrors((file, options = actionOptions.upload) => { + return providerInstance.upload(file, options); + }), + delete: wrapFunctionForErrors((file, options = actionOptions.delete) => { + return providerInstance.delete(file, options); + }), }); } catch (err) { strapi.log.error(err); diff --git a/packages/strapi-provider-upload-cloudinary/README.md b/packages/strapi-provider-upload-cloudinary/README.md index 165a793ca3..1683f79b44 100644 --- a/packages/strapi-provider-upload-cloudinary/README.md +++ b/packages/strapi-provider-upload-cloudinary/README.md @@ -4,6 +4,8 @@ Your configuration is passed down to the cloudinary configuration. (e.g: `cloudinary.config(config)`). You can see the complete list of options [here](https://cloudinary.com/documentation/cloudinary_sdks#configuration_parameters) +`actionOptions` are passed directly to the upload and delete functions respectively allowing for custom options such as folder, type, etc. You can see the complete list of upload options [here](https://cloudinary.com/documentation/image_upload_api_reference#upload_optional_parameters) and delete options [here](https://cloudinary.com/documentation/image_upload_api_reference#destroy_optional_parameters) + See the [using a provider](https://strapi.io/documentation/developer-docs/latest/plugins/upload.html#using-a-provider) documentation for information on installing and using a provider. And see the [environment variables](https://strapi.io/documentation/developer-docs/latest/concepts/configurations.html#environment-variables) for setting and using environment variables in your configs. **Example** @@ -20,6 +22,10 @@ module.exports = ({ env }) => ({ api_key: env('CLOUDINARY_KEY'), api_secret: env('CLOUDINARY_SECRET'), }, + actionOptions: { + upload: {}, + delete: {} + } }, // ... }); From 7e0d50c6da36508f24f9f960c38aed58a94e6cf8 Mon Sep 17 00:00:00 2001 From: soupette Date: Thu, 28 Jan 2021 11:55:46 +0100 Subject: [PATCH 05/18] Fix snapshots Signed-off-by: soupette --- jest.config.front.js | 1 + .../HeadersInput/tests/__snapshots__/index.test.js.snap | 4 ++-- .../Webhooks/Inputs/tests/__snapshots__/index.test.js.snap | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jest.config.front.js b/jest.config.front.js index 47cae629ea..dced343674 100644 --- a/jest.config.front.js +++ b/jest.config.front.js @@ -58,6 +58,7 @@ module.exports = { '/examples/getstarted/', '/packages/strapi-helper-plugin/dist/', '/OLD/', + '__tests__', ], setupFilesAfterEnv: [ '/test/config/front/enzyme-setup.js', diff --git a/packages/strapi-admin/admin/src/components/Webhooks/HeadersInput/tests/__snapshots__/index.test.js.snap b/packages/strapi-admin/admin/src/components/Webhooks/HeadersInput/tests/__snapshots__/index.test.js.snap index 8efee6c3fb..00713de5d4 100644 --- a/packages/strapi-admin/admin/src/components/Webhooks/HeadersInput/tests/__snapshots__/index.test.js.snap +++ b/packages/strapi-admin/admin/src/components/Webhooks/HeadersInput/tests/__snapshots__/index.test.js.snap @@ -280,7 +280,7 @@ exports[`Admin | components | HeadersInput should render properly should match t >
+ + + + + + +
+ ); + } + return ( { }); }} > - {!snapshot && } + {!snapshot && ( + + )} + {previewUrl ? ( - + ) : ( <> diff --git a/packages/strapi-plugin-upload/admin/src/components/VideoPreview/reducer.js b/packages/strapi-plugin-upload/admin/src/components/VideoPreview/reducer.js index 3809dcf882..572d344abd 100644 --- a/packages/strapi-plugin-upload/admin/src/components/VideoPreview/reducer.js +++ b/packages/strapi-plugin-upload/admin/src/components/VideoPreview/reducer.js @@ -7,6 +7,7 @@ const initialState = fromJS({ metadataLoaded: false, seeked: false, snapshot: false, + isError: false, }); const videoReducer = (state, action) => { @@ -21,6 +22,8 @@ const videoReducer = (state, action) => { return state.update('isHover', () => action.isHover); case 'SET_SNAPSHOT': return state.update('snapshot', () => action.snapshot); + case 'SET_ERROR': + return state.update('isError', () => action.isError); default: return state; } diff --git a/packages/strapi-plugin-upload/admin/src/components/VideoPreview/tests/VideoPreview.test.js b/packages/strapi-plugin-upload/admin/src/components/VideoPreview/tests/VideoPreview.test.js new file mode 100644 index 0000000000..acec811ae0 --- /dev/null +++ b/packages/strapi-plugin-upload/admin/src/components/VideoPreview/tests/VideoPreview.test.js @@ -0,0 +1,78 @@ +import React from 'react'; +import { screen, render, fireEvent } from '@testing-library/react'; +import { ThemeProvider } from 'styled-components'; +import VideoPreview from '..'; +import themes from '../../../../../../strapi-admin/admin/src/themes'; + +jest.mock('react-intl', () => ({ + // eslint-disable-next-line react/prop-types + FormattedMessage: ({ id }) =>
{id}
, + useIntl: () => ({ + formatMessage: ({ id }) => id, + }), +})); + +describe('VideoPreview', () => { + it('shows its initial state with no props', () => { + const { container } = render( + + + + ); + + expect(container).toMatchSnapshot(); + }); + + it('shows a loading state when resolving the asset', () => { + render( + + + + ); + + expect(screen.getByLabelText('upload.list.assets.loading-asset')).toBeVisible(); + }); + + it('shows the thumbnail but not the video when previewURL is passed', () => { + const { container } = render( + + + + ); + + expect(screen.getByAltText('upload.list.assets.preview-asset')).toBeVisible(); + + expect(container.querySelector('video')).toBeFalsy(); + }); + + it('shows the video when the previewURL is not passed', () => { + const { container } = render( + + + + ); + + expect(container.querySelector('video')).toBeVisible(); + }); + + it('shows a fallback message when the video is in error', () => { + const { container } = render( + + + + ); + + fireEvent(container.querySelector('video'), new Event('error')); + + expect(screen.getByTitle('upload.list.assets.not-supported-title')).toBeTruthy(); + expect(screen.getByText('upload.list.assets.not-supported-content')).toBeVisible(); + }); +}); diff --git a/packages/strapi-plugin-upload/admin/src/components/VideoPreview/tests/__snapshots__/VideoPreview.test.js.snap b/packages/strapi-plugin-upload/admin/src/components/VideoPreview/tests/__snapshots__/VideoPreview.test.js.snap new file mode 100644 index 0000000000..03dae6bbc5 --- /dev/null +++ b/packages/strapi-plugin-upload/admin/src/components/VideoPreview/tests/__snapshots__/VideoPreview.test.js.snap @@ -0,0 +1,118 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`VideoPreview shows its initial state with no props 1`] = ` +.c3 { + margin: 0; + line-height: normal; + color: #ffffff; + font-size: 13px; + font-weight: 500; + text-transform: none; +} + +.c4 { + position: absolute; + bottom: 10px; + right: 10px; + padding: 3px 5px; + border-radius: 2px; + background-color: #333740; +} + +.c1 { + position: relative; + width: 44%; + height: 4px; + overflow: hidden; + background-color: #515764; + border-radius: 2px; +} + +.c1:before { + content: ''; + display: block; + position: absolute; + left: -100px; + width: 100px; + height: 4px; + background-color: #b3b5b9; + -webkit-animation: gPeyzP 2s linear infinite; + animation: gPeyzP 2s linear infinite; +} + +.c0 { + position: relative; + width: 100%; + height: 100%; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: center; + -webkit-justify-content: center; + -ms-flex-pack: center; + justify-content: center; +} + +.c0 video { + display: none; +} + +.c2 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: center; + -webkit-justify-content: center; + -ms-flex-pack: center; + justify-content: center; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; +} + +.c2 canvas { + display: block; + max-width: 100%; + max-height: 100%; + width: auto; + height: auto; + margin: auto; +} + +
+
+
+
+
+
+
+`; diff --git a/packages/strapi-plugin-upload/admin/src/icons/File/index.js b/packages/strapi-plugin-upload/admin/src/icons/File/index.js index 144c66955f..814d59e657 100644 --- a/packages/strapi-plugin-upload/admin/src/icons/File/index.js +++ b/packages/strapi-plugin-upload/admin/src/icons/File/index.js @@ -1,8 +1,10 @@ import React from 'react'; +import PropTypes from 'prop-types'; -const File = props => { +const File = ({ title, ...props }) => { return ( + {title} { ); }; +File.defaultProps = { + title: '', +}; + +File.propTypes = { + title: PropTypes.string, +}; + export default File; diff --git a/packages/strapi-plugin-upload/admin/src/translations/en.json b/packages/strapi-plugin-upload/admin/src/translations/en.json index 9845cdab28..e41fe6176b 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/en.json +++ b/packages/strapi-plugin-upload/admin/src/translations/en.json @@ -35,6 +35,10 @@ "list.assets.selected.plural": "{number} assets selected", "list.assets.selected.singular": "{number} asset selected", "list.assets.type-not-allowed": "This type of file is not allowed.", + "list.assets.not-supported-title": "Media not supported", + "list.assets.not-supported-content": "Preview doesn't not support this media content.", + "list.assets.loading-asset": "Loading the preview for the media: {path}", + "list.assets.preview-asset": "Preview for the video at path {path}", "modal.file-details.date": "Date", "modal.file-details.dimensions": "Dimensions", "modal.file-details.extension": "Extension", diff --git a/packages/strapi-plugin-upload/admin/src/translations/fr.json b/packages/strapi-plugin-upload/admin/src/translations/fr.json index 5b51121d14..8bd4fbbbf1 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/fr.json +++ b/packages/strapi-plugin-upload/admin/src/translations/fr.json @@ -35,6 +35,10 @@ "list.assets.selected.plural": "{number} médias sélectionnés", "list.assets.selected.singular": "{number} média sélectionné", "list.assets.type-not-allowed": "Ce type de fichier n'est pas autorisé.", + "list.assets.not-supported-title": "Media non supporté", + "list.assets.not-supported-content": "Ce type de contenu n'est pas supporté par la preview.", + "list.assets.loading-asset": "Chargement du contenu pour le media {path}", + "list.assets.preview-asset": "Preview de la vidéo {path}", "modal.file-details.date": "Date", "modal.file-details.dimensions": "Dimensions", "modal.file-details.extension": "Extension", diff --git a/test/config/front/strapi.js b/test/config/front/strapi.js index 182c0a6e71..1ea0728f8d 100644 --- a/test/config/front/strapi.js +++ b/test/config/front/strapi.js @@ -7,6 +7,8 @@ // Setup the strapi functioon global variable +import '@testing-library/jest-dom/extend-expect'; + const React = require('react'); const hoistNonReactStatics = require('hoist-non-react-statics'); From 59f0c4f30dd8fc651939dc63fd56c0b8f42b2660 Mon Sep 17 00:00:00 2001 From: mfrachet Date: Fri, 29 Jan 2021 14:25:55 +0100 Subject: [PATCH 12/18] Add test for reducer --- .../components/VideoPreview/tests/reducer.test.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packages/strapi-plugin-upload/admin/src/components/VideoPreview/tests/reducer.test.js b/packages/strapi-plugin-upload/admin/src/components/VideoPreview/tests/reducer.test.js index 86e79360c7..5d7c5ce591 100644 --- a/packages/strapi-plugin-upload/admin/src/components/VideoPreview/tests/reducer.test.js +++ b/packages/strapi-plugin-upload/admin/src/components/VideoPreview/tests/reducer.test.js @@ -79,4 +79,17 @@ describe('Upload | components | VideoPreview | reducer', () => { expect(reducer(state, action)).toEqual(expectedState); }); + + it('should set isError to true when the payload is true', () => { + const state = initialState; + + const action = { + type: 'SET_ERROR', + isError: true, + }; + + const expectedState = state.set('isError', true); + + expect(reducer(state, action)).toEqual(expectedState); + }); }); From 326f6d8d518a1be6b636a14da059fae34d3f5bb9 Mon Sep 17 00:00:00 2001 From: mfrachet Date: Fri, 29 Jan 2021 15:24:57 +0100 Subject: [PATCH 13/18] Increasing padding bottom to prevent question button from overlapping --- .../admin/src/components/Container/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Container/index.js b/packages/strapi-plugin-content-manager/admin/src/components/Container/index.js index 74a5fae189..b5c9ceee0a 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/Container/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/Container/index.js @@ -1,7 +1,7 @@ import styled from 'styled-components'; const Container = styled.div` - padding: 18px 30px 18px 30px; + padding: 18px 30px 66px 30px; `; export default Container; From 3e1b8a0364f20a46e91dc4715efbb7fa9211869b Mon Sep 17 00:00:00 2001 From: mfrachet Date: Fri, 29 Jan 2021 16:28:56 +0100 Subject: [PATCH 14/18] Reducing the amount of things pushed --- .../src/components/VideoPreview/index.js | 28 ++++++------------- .../VideoPreview/tests/VideoPreview.test.js | 1 - .../admin/src/icons/File/index.js | 12 +------- .../admin/src/translations/en.json | 3 +- .../admin/src/translations/fr.json | 3 +- 5 files changed, 11 insertions(+), 36 deletions(-) diff --git a/packages/strapi-plugin-upload/admin/src/components/VideoPreview/index.js b/packages/strapi-plugin-upload/admin/src/components/VideoPreview/index.js index 22fd13a508..887bc49b06 100644 --- a/packages/strapi-plugin-upload/admin/src/components/VideoPreview/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/VideoPreview/index.js @@ -9,20 +9,13 @@ import Wrapper from './Wrapper'; import CanvasWrapper from './CanvasWrapper'; import Thumbnail from './Thumbnail'; import reducer, { initialState } from './reducer'; -import File from '../../icons/File'; import getTrad from '../../utils/getTrad'; -const EmptyPreviewTitle = styled.h3` - text-align: center; - color: ${({ theme }) => theme.main.colors.white}; - font-size: ${({ theme }) => theme.main.sizes.fonts.xl}; -`; - -const EmptyPreviewContent = styled.p` - font-size: ${({ theme }) => theme.main.sizes.fonts.xs}; - text-align: center; - color: ${({ theme }) => theme.main.colors.white}; - padding: 0 ${({ theme }) => theme.main.sizes.paddings.sm}; +const EmptyPreview = styled.div` + display: flex; + align-items: center; + justify-content: center; + color: ${({ theme }) => theme.main.colors.grey}; `; const VideoPreview = ({ hasIcon, previewUrl, src }) => { @@ -77,14 +70,9 @@ const VideoPreview = ({ hasIcon, previewUrl, src }) => { if (isError) { return ( -
- - - - - - -
+ + + ); } diff --git a/packages/strapi-plugin-upload/admin/src/components/VideoPreview/tests/VideoPreview.test.js b/packages/strapi-plugin-upload/admin/src/components/VideoPreview/tests/VideoPreview.test.js index acec811ae0..fbea94daa7 100644 --- a/packages/strapi-plugin-upload/admin/src/components/VideoPreview/tests/VideoPreview.test.js +++ b/packages/strapi-plugin-upload/admin/src/components/VideoPreview/tests/VideoPreview.test.js @@ -72,7 +72,6 @@ describe('VideoPreview', () => { fireEvent(container.querySelector('video'), new Event('error')); - expect(screen.getByTitle('upload.list.assets.not-supported-title')).toBeTruthy(); expect(screen.getByText('upload.list.assets.not-supported-content')).toBeVisible(); }); }); diff --git a/packages/strapi-plugin-upload/admin/src/icons/File/index.js b/packages/strapi-plugin-upload/admin/src/icons/File/index.js index 814d59e657..144c66955f 100644 --- a/packages/strapi-plugin-upload/admin/src/icons/File/index.js +++ b/packages/strapi-plugin-upload/admin/src/icons/File/index.js @@ -1,10 +1,8 @@ import React from 'react'; -import PropTypes from 'prop-types'; -const File = ({ title, ...props }) => { +const File = props => { return ( - {title} { ); }; -File.defaultProps = { - title: '', -}; - -File.propTypes = { - title: PropTypes.string, -}; - export default File; diff --git a/packages/strapi-plugin-upload/admin/src/translations/en.json b/packages/strapi-plugin-upload/admin/src/translations/en.json index e41fe6176b..823a9ee394 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/en.json +++ b/packages/strapi-plugin-upload/admin/src/translations/en.json @@ -35,8 +35,7 @@ "list.assets.selected.plural": "{number} assets selected", "list.assets.selected.singular": "{number} asset selected", "list.assets.type-not-allowed": "This type of file is not allowed.", - "list.assets.not-supported-title": "Media not supported", - "list.assets.not-supported-content": "Preview doesn't not support this media content.", + "list.assets.not-supported-content": "No preview available", "list.assets.loading-asset": "Loading the preview for the media: {path}", "list.assets.preview-asset": "Preview for the video at path {path}", "modal.file-details.date": "Date", diff --git a/packages/strapi-plugin-upload/admin/src/translations/fr.json b/packages/strapi-plugin-upload/admin/src/translations/fr.json index 8bd4fbbbf1..536256bd2c 100644 --- a/packages/strapi-plugin-upload/admin/src/translations/fr.json +++ b/packages/strapi-plugin-upload/admin/src/translations/fr.json @@ -35,8 +35,7 @@ "list.assets.selected.plural": "{number} médias sélectionnés", "list.assets.selected.singular": "{number} média sélectionné", "list.assets.type-not-allowed": "Ce type de fichier n'est pas autorisé.", - "list.assets.not-supported-title": "Media non supporté", - "list.assets.not-supported-content": "Ce type de contenu n'est pas supporté par la preview.", + "list.assets.not-supported-content": "Preview non disponible", "list.assets.loading-asset": "Chargement du contenu pour le media {path}", "list.assets.preview-asset": "Preview de la vidéo {path}", "modal.file-details.date": "Date", From 2da67ed76a363793760e433a83f09b73b2cdd016 Mon Sep 17 00:00:00 2001 From: mfrachet Date: Fri, 29 Jan 2021 16:35:09 +0100 Subject: [PATCH 15/18] Modifying font size --- .../admin/src/components/VideoPreview/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/strapi-plugin-upload/admin/src/components/VideoPreview/index.js b/packages/strapi-plugin-upload/admin/src/components/VideoPreview/index.js index 887bc49b06..6f9bf3419c 100644 --- a/packages/strapi-plugin-upload/admin/src/components/VideoPreview/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/VideoPreview/index.js @@ -15,6 +15,7 @@ const EmptyPreview = styled.div` display: flex; align-items: center; justify-content: center; + font-size: ${({ theme }) => theme.main.sizes.fonts.xs}; color: ${({ theme }) => theme.main.colors.grey}; `; From e1b7c8b67cd1545df7a88dd22347a556e1f70dfc Mon Sep 17 00:00:00 2001 From: soupette Date: Fri, 29 Jan 2021 16:58:04 +0100 Subject: [PATCH 16/18] Fixes #9259 Signed-off-by: soupette --- .../admin/src/components/InputUID/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/strapi-plugin-content-manager/admin/src/components/InputUID/index.js b/packages/strapi-plugin-content-manager/admin/src/components/InputUID/index.js index a978c41f62..6d282f64cb 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/InputUID/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/InputUID/index.js @@ -42,6 +42,7 @@ const InputUID = ({ contentTypeUID, description, error: inputError, + label: inputLabel, name, onChange, validations, @@ -217,7 +218,7 @@ const InputUID = ({ return ( - {name} + {inputLabel}