Merge branch 'master' into develop

This commit is contained in:
Alexandre Bodin 2019-07-25 15:05:07 +02:00
commit 04d4b60056
44 changed files with 163 additions and 162 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 875 KiB

View File

@ -23,6 +23,7 @@ Please refer to the [language configuration](../configurations/configurations.md
Let's say we want to say `Hello John` in english and `Bonjour Tom` in french. We need to use the built-in `i18n` feature and replace the string based on the received name.
**Path —** `./api/hello/config/routes.json`.
```json
{
"routes": [
@ -36,18 +37,20 @@ Let's say we want to say `Hello John` in english and `Bonjour Tom` in french. We
```
**Path —** `./api/hello/controllers/Hello.js`.
```js
module.exports = {
// GET /hello/:name
sayHello: async (ctx) => {
sayHello: async ctx => {
ctx.send(ctx.i18n.__('Hello %s', ctx.params.name));
}
},
};
```
You need to define the english and french translation for this key.
**Path —** `./config/locales/en_US.json`.
```json
{
"Hello %s": "Hello %s"
@ -55,6 +58,7 @@ You need to define the english and french translation for this key.
```
**Path —** `./config/locales/fr_FR.json`.
```json
{
"Hello %s": "Bonjour %s"
@ -62,17 +66,3 @@ You need to define the english and french translation for this key.
```
That's all! The request `GET /hello/John?locale=en_US` will return `Hello John` and `GET /hello/Tom?locale=fr_FR` will return `Bonjour Tom`.
## Content Internationalization
Translating content from a language to another has been requested by many of you. As you may have seen on our website, the [Internationalization plugin](https://strapi.io/marketplace/internationalization) is not available yet because we need to go out of alpha before developing new plugins.
But, no worries, we have a good **work around to help you internationalize your content**!
The solution is simple: **suffix your fields**.
For example if you are building a blog with posts, you may have a Content Type `post` with two fields: `title` and `content`. To make them available in english and french for example, simply replace them by `title_en`, `title_fr`, `content_en` and `content_fr`.
Then, when you request your API, you will get all these fields in your response payload. If you want to select only some of them (in a specific language) we recommend you to use the [GraphQL plugin](graphql.md).
![Content Internationalization Strapi](../assets/internationalization.gif)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 875 KiB

View File

@ -232,40 +232,50 @@ Follow these steps to configure a local Strapi project to use a [MongoDB Atlas](
- In **Cluster Name**, name your cluster.
- Click the green `Create Cluster` button. You will get a message that says, "_Your cluster is being created..._"
2. Next, click on the `Security` tab (next to `Overview`):
2. Next, click on the `Database Access` in the left menu (under `Overview`):
- Click the green `+ ADD NEW USER` button:
- Enter a `username`.
- Enter a `password`.
- Under `User Privileges` ensure **`Read and write to any database`** is selected. Then click `Add User` to save.
3. Then `whitelist` your IP address. Under `Security`, click to `IP Whitelist`
3. Then `whitelist` your IP address. Click into `Network Access`, under `Security` in the left menu:
- Click the green `+ ADD IP ADDRESS`
- Next click `ALLOW ACCESS FROM ANYWHERE`. **Note:** In permanent projects you would configure this with the appropriate IP addresses.
- Click `Confirm`. Then wait until the status turns from `Pending` to `Active`.
- Click `ADD CURRENT IP ADDRESS` or **manually** enter in an IP address to `whitelist`.
- Leave a comment to label this IP Address. E.g. `Office`.
- Then click the green `Confirm` button.
- Delete the `0.0.0.0/0` configuration after testing the connection.
**NOTE:** If for any reason you need to test the configuration or other aspect of your connection to the database, you may want to set back the `Allow Access from Anywhere`. Follow this steps:
- Click the green `+ ADD IP ADDRESS`
- Next add `0.0.0.0/0` in the `Whitelist Entry`. **Note:** In permanent projects you would configure this with the appropriate IP addresses.
- Leave a comment to label this IP Address. E.g. `Anywhere`.
- Click `Confirm`. Then wait until the status turns from `Pending` to `Active`.
**OPTIONAL:** If you are serving you Strapi project from a known IP Address then follow the following steps to `allow Network Access`:
- **Manually** enter in an IP address to `whitelist`, for your Strapi server.
- Leave a comment to label this IP Address. E.g. `Heroku Server`
- Then click the green `Confirm` button.
4. Retrieve database credentials
MongoDB Atlas automatically exposes the database credentials into a single environment variable accessible by your app. To locate it, follow these steps:
- Under the `Overview` tab, click `CONNECT` and then `Connect Your Application`.
- Under `1. Choose your driver version`, select **DRIVER** as `Node.js` and **VERSION** as `2.2.12 or later`.
- Under `Atlas` in the left-hand, click on `Clusters`. This should take you to your `cluster`. Next, click `CONNECT` and then `Connect Your Application`.
- Under `1. Choose your driver version`, select **DRIVER** as `Node.js` and **VERSION** as `2.2.12 or later`. **IMPORTANT:** You **must** use `Version: 2.2.12 or later`.
- This should show a **Connection String Only** similar to this:
`mongodb://paulbocuse:<password>@strapi-heroku-shard-00-00-o777o.mongodb.net:27017,strapi-heroku-shard-00-01-o606o.mongodb.net:27017,strapi-heroku-shard-00-02-o606o.mongodb.net:27017/test?ssl=true&replicaSet=Strapi-Heroku-shard-0&authSource=admin&retryWrites=true`
`mongodb://paulbocuse:<password>@strapi-heroku-shard-00-00-oxxxo.mongodb.net:27017,strapi-heroku-shard-00-01-oxxxo.mongodb.net:27017,strapi-heroku-shard-00-02-oxxxo.mongodb.net:27017/test?ssl=true&replicaSet=Strapi-Heroku-shard-0&authSource=admin&retryWrites=true&w=majority`
- You are interested in everything **AFTER** the **@** symbol. This is your **Database Host** variable. So in this case,
**IMPORTANT:** Please note the `<password>` after your `username`. In this example, after `mongodb://paulbocuse:`. You will need to replace the `<password>` with the password you created earlier for this user in your **MongoDB Atlas** account.
`strapi-heroku-shard-00-00-o777o.mongodb.net:27017,strapi-heroku-shard-00-01-o606o.mongodb.net:27017,strapi-heroku-shard-00-02-o606o.mongodb.net:27017/test?ssl=true&replicaSet=Strapi-Heroku-shard-0&authSource=admin&retryWrites=true`\_
5. Update and replace your existing `/database.json` config file for the appropriate environment (development | production).
- You created earlier a `cluster name`, `username` and `password`. These are the other variables needed to configure your project to connect to MongoDB Atlas.
Keep these five MongoDB Atlas database variables from your MongoDB Atlas account ready and available.
5. Update your database config file
Replace the contents of `database.json` with the following:
Replace the contents of `/database.json` with the following and replace **< password >** with the password of the user of your database you created earlier:
`Path: ./config/environments/(development|production)/database.json`.
@ -276,12 +286,7 @@ Replace the contents of `database.json` with the following:
"default": {
"connector": "strapi-hook-mongoose",
"settings": {
"client": "mongo",
"host": "cluster0-shard-00-00-y8imj.mongodb.net:27017,cluster0-shard-00-01-y8imj.mongodb.net:27017,cluster0-shard-00-02-y8imj.mongodb.net:27017/test?ssl=true&replicaSet=Cluster0-shard-0&authSource=admin&retryWrites=true",
"port": 27017,
"database": "test",
"username": "john",
"password": "doe"
"uri": "mongodb://paulbocuse:<password>@strapidatabase-shard-00-00-fxxx6c.mongodb.net:27017,strapidatabase-shard-00-01-fxxxc.mongodb.net:27017,strapidatabase-shard-00-02-fxxxc.mongodb.net:27017/test?ssl=true&replicaSet=strapidatabase-shard-0&authSource=admin&retryWrites=true&w=majority"
},
"options": {
"ssl": true
@ -291,4 +296,16 @@ Replace the contents of `database.json` with the following:
}
```
::: warning Note
The above configuration will create a database called `strapi`, the _default database_ Strapi sets for any **MongoDB** database. If you would like to name your database something else, add the following **key:value pair** into your **"settings":** located in your `database.json` file.
`"database": "my-database-name"`
:::
::: danger Warning
We recommend replacing sensitive (eg. "URI string" above) information in your database.json files before uploading your project to a public repository such as GitHub. For more information about using environment variables, please read [dynamic configurations](/3.0.0-beta.x/configurations/configurations.html#dynamic-configurations).
:::
You are now ready use Strapi locally or to deploy your project to an external hosting provider and use MongoDB Atlas as your database server.

View File

@ -1218,7 +1218,7 @@ Init the Git repository and commit your project.
cd my-project
git init
git add .
git commit -am "Initial Commit"
git commit -m "Initial Commit"
```
### 6. Create a Heroku project
@ -1343,23 +1343,25 @@ npm install pg --save
Please follow these steps the **deploy a Strapi app with MongoDB on Heroku**.
You must have completed the [steps to use Strapi with MongoDB Atlas in production](/3.0.0-beta.x/guides/databases.html#install-on-atlas-mongodb-atlas).
You must have completed the [steps to use Strapi with MongoDB Atlas](/3.0.0-beta.x/guides/databases.html#install-on-atlas-mongodb-atlas) - through **4. Retrieve database credentials**.
##### 1. Set environment variables
When you [set-up your MongoDB Atlas database](/3.0.0-beta.x/guides/databases.html#install-on-atlas-mongodb-atlas) you created and noted the five key/value pairs that correspond to your **MongoDB Atlas** database. These five keys are: `DATABASE_NAME`, `DATABASE_USERNAME`, `DATABASE_PASSWORD`, `DATABASE PORT`, and `DATABASE_HOST`.
Strapi expects a variable for each database connection detail (host, username, etc.). So, from **MongoDB Atlas**, you have to set the environment variables in the Heroku config (for **DATABASE_HOST** you need to surround the URL with **""**, and set **DATABASE_PORT** to nothing):
When you [set-up your MongoDB Atlas database](/3.0.0-beta.x/guides/databases.html#install-on-atlas-mongodb-atlas) you noted a connection string. Similar to this:
```bash
heroku config:set DATABASE_USERNAME=paulbocuse
heroku config:set DATABASE_PASSWORD=mySecretPassword
heroku config:set DATABASE_HOST="stapi-mongo-heroku-shard-00-00-fty6c.mongodb.net:27017,strapi-mongo-heroku-shard-00-01-fty6c.mongodb.net:27017,strapi-mongo-heroku-shard-00-02-fty6c.mongodb.net:27017/test?ssl=true&replicaSet=strapi-mongo-heroku-shard-0&authSource=admin&retryWrites=true"
heroku config:set DATABASE_PORT=
heroku config:set DATABASE_NAME=strapi-mongo-heroku
mongodb://paulbocuse:<password>@strapidatabase-shard-00-00-fxxx6c.mongodb.net:27017,strapidatabase-shard-00-01-fxxxc.mongodb.net:27017,strapidatabase-shard-00-02-fxxxc.mongodb.net:27017/test?ssl=true&replicaSet=strapidatabase-shard-0&authSource=admin&retryWrites=true&w=majority
```
**Note:** Please replace these above values with your actual values.
So, from **MongoDB Atlas**, you have to set two environment variables in the Heroku config (for **DATABASE_URI** and **DATABASE_NAME**). Set the environment variables using the following commands:
```bash
heroku config:set DATABASE_URI="mongodb://paulbocuse:<password>@strapidatabase-shard-00-00-fxxx6c.mongodb.net:27017,strapidatabase-shard-00-01-fxxxc.mongodb.net:27017,strapidatabase-shard-00-02-fxxxc.mongodb.net:27017/test?ssl=true&replicaSet=strapidatabase-shard-0&authSource=admin&retryWrites=true&w=majority"
heroku config:set DATABASE_NAME="my-database-name"
```
**Note:** Please replace the `<password>` and `my-database-name` values with the your actual values.
##### 2. Update your database config file
@ -1374,12 +1376,8 @@ Replace the contents of `database.json` with the following:
"default": {
"connector": "strapi-hook-mongoose",
"settings": {
"client": "mongo",
"host": "${process.env.DATABASE_HOST}",
"port": "${process.env.DATABASE_PORT}",
"database": "${process.env.DATABASE_NAME}",
"username": "${process.env.DATABASE_USERNAME}",
"password": "${process.env.DATABASE_PASSWORD}"
"uri": "${process.env.DATABASE_URI}",
"database": "${process.env.DATABASE_NAME}"
},
"options": {
"ssl": true
@ -1396,7 +1394,8 @@ Replace the contents of `database.json` with the following:
`Path: ./my-project/`
```bash
git commit -am "Update database config"
git add .
git commit -m "Update database config"
```
### 9. Deploy

View File

@ -23,6 +23,7 @@ Please refer to the [language configuration](../configurations/configurations.md
Let's say we want to say `Hello John` in english and `Bonjour Tom` in french. We need to use the built-in `i18n` feature and replace the string based on the received name.
**Path —** `./api/hello/config/routes.json`.
```json
{
"routes": [
@ -36,18 +37,20 @@ Let's say we want to say `Hello John` in english and `Bonjour Tom` in french. We
```
**Path —** `./api/hello/controllers/Hello.js`.
```js
module.exports = {
// GET /hello/:name
sayHello: async (ctx) => {
sayHello: async ctx => {
ctx.send(ctx.i18n.__('Hello %s', ctx.params.name));
}
},
};
```
You need to define the english and french translation for this key.
**Path —** `./config/locales/en_US.json`.
```json
{
"Hello %s": "Hello %s"
@ -55,24 +58,11 @@ You need to define the english and french translation for this key.
```
**Path —** `./config/locales/fr_FR.json`.
```json
{
"Hello %s": "Bonjour %s"
}
```
That's all! The request `GET /hello/John?locale=en_US` will return `Hello John` and `GET /hello/Tom?locale=fr_FR` will return `Bonjour Tom`.
## Content Internationalization
Translating content from a language to another has been requested by many of you. As you may have seen on our website, the [Internationalization plugin](https://strapi.io/marketplace/internationalization) is not available yet because we need to go out of alpha before developing new plugins.
But, no worries, we have a good **work around to help you internationalize your content**!
The solution is simple: **suffix your fields**.
For example if you are building a blog with posts, you may have a Content Type `post` with two fields: `title` and `content`. To make them available in english and french for example, simply replace them by `title_en`, `title_fr`, `content_en` and `content_fr`.
Then, when you request your API, you will get all these fields in your response payload. If you want to select only some of them (in a specific language) we recommend you to use the [GraphQL plugin](graphql.md).
![Content Internationalization Strapi](../assets/internationalization.gif)
That's all! The request `GET /hello/John?locale=en_US` will return `Hello John` and `GET /hello/Tom?locale=fr_FR` will return `Bonjour Tom`

View File

@ -1,7 +1,7 @@
{
"name": "getstarted",
"private": true,
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "A Strapi application.",
"scripts": {
"develop": "strapi develop",
@ -15,23 +15,23 @@
"mysql": "^2.17.1",
"pg": "^7.10.0",
"sqlite3": "^4.0.6",
"strapi": "3.0.0-beta.13",
"strapi-admin": "3.0.0-beta.13",
"strapi-hook-bookshelf": "3.0.0-beta.13",
"strapi-hook-knex": "3.0.0-beta.13",
"strapi-hook-mongoose": "3.0.0-beta.13",
"strapi-middleware-views": "3.0.0-beta.13",
"strapi-plugin-content-manager": "3.0.0-beta.13",
"strapi-plugin-content-type-builder": "3.0.0-beta.13",
"strapi-plugin-documentation": "3.0.0-beta.13",
"strapi-plugin-email": "3.0.0-beta.13",
"strapi-plugin-graphql": "3.0.0-beta.13",
"strapi-plugin-settings-manager": "3.0.0-beta.13",
"strapi-plugin-upload": "3.0.0-beta.13",
"strapi-plugin-users-permissions": "3.0.0-beta.13",
"strapi-provider-email-mailgun": "3.0.0-beta.13",
"strapi-provider-upload-aws-s3": "3.0.0-beta.13",
"strapi-utils": "3.0.0-beta.13"
"strapi": "3.0.0-beta.14",
"strapi-admin": "3.0.0-beta.14",
"strapi-hook-bookshelf": "3.0.0-beta.14",
"strapi-hook-knex": "3.0.0-beta.14",
"strapi-hook-mongoose": "3.0.0-beta.14",
"strapi-middleware-views": "3.0.0-beta.14",
"strapi-plugin-content-manager": "3.0.0-beta.14",
"strapi-plugin-content-type-builder": "3.0.0-beta.14",
"strapi-plugin-documentation": "3.0.0-beta.14",
"strapi-plugin-email": "3.0.0-beta.14",
"strapi-plugin-graphql": "3.0.0-beta.14",
"strapi-plugin-settings-manager": "3.0.0-beta.14",
"strapi-plugin-upload": "3.0.0-beta.14",
"strapi-plugin-users-permissions": "3.0.0-beta.14",
"strapi-provider-email-mailgun": "3.0.0-beta.14",
"strapi-provider-upload-aws-s3": "3.0.0-beta.14",
"strapi-utils": "3.0.0-beta.14"
},
"strapi": {
"uuid": "getstarted"

View File

@ -1,5 +1,5 @@
{
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"packages": [
"packages/*",
"examples/*"

View File

@ -1,6 +1,6 @@
{
"name": "create-strapi-app",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Generate a new Strapi application.",
"license": "MIT",
"homepage": "http://strapi.io",
@ -21,7 +21,7 @@
],
"dependencies": {
"commander": "^2.20.0",
"strapi-generate-new": "3.0.0-beta.13"
"strapi-generate-new": "3.0.0-beta.14"
},
"scripts": {
"test": "echo \"no tests yet\""

View File

@ -1,6 +1,6 @@
{
"name": "strapi-admin",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Strapi Admin",
"repository": {
"type": "git",
@ -74,8 +74,8 @@
"sanitize.css": "^4.1.0",
"sass-loader": "^7.1.0",
"shelljs": "^0.7.8",
"strapi-helper-plugin": "3.0.0-beta.13",
"strapi-utils": "3.0.0-beta.13",
"strapi-helper-plugin": "3.0.0-beta.14",
"strapi-utils": "3.0.0-beta.14",
"style-loader": "^0.23.1",
"styled-components": "^4.2.0",
"terser-webpack-plugin": "^1.2.3",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-api",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Generate an API for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-controller",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Generate a controller for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-model",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Generate a model for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-new",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Generate a new Strapi application.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-plugin",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Generate an plugin for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-policy",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Generate a policy for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate-service",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Generate a service for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-generate",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Master of ceremonies for the Strapi generators.",
"homepage": "http://strapi.io",
"keywords": [
@ -20,7 +20,7 @@
"fs-extra": "^8.0.1",
"lodash": "^4.17.11",
"reportback": "^2.0.2",
"strapi-utils": "3.0.0-beta.13"
"strapi-utils": "3.0.0-beta.14"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-helper-plugin",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Helper for Strapi plugins development",
"files": [
"dist"

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-bookshelf",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Bookshelf hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -21,8 +21,8 @@
"lodash": "^4.17.11",
"pluralize": "^7.0.0",
"rimraf": "^2.6.3",
"strapi-hook-knex": "3.0.0-beta.13",
"strapi-utils": "3.0.0-beta.13"
"strapi-hook-knex": "3.0.0-beta.14",
"strapi-utils": "3.0.0-beta.14"
},
"strapi": {
"dependencies": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-ejs",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "EJS hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-knex",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Knex hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-mongoose",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Mongoose hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -19,7 +19,7 @@
"mongoose": "^5.5.9",
"mongoose-float": "^1.0.4",
"pluralize": "^7.0.0",
"strapi-utils": "3.0.0-beta.13"
"strapi-utils": "3.0.0-beta.14"
},
"author": {
"email": "hi@strapi.io",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-hook-redis",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Redis hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
@ -19,7 +19,7 @@
"lodash": "^4.17.11",
"rimraf": "^2.6.3",
"stack-trace": "0.0.10",
"strapi-utils": "3.0.0-beta.13"
"strapi-utils": "3.0.0-beta.14"
},
"author": {
"email": "hi@strapi.io",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-middleware-views",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Views middleware to enable server-side rendering for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-content-manager",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "A powerful UI to easily manage your data.",
"strapi": {
"name": "Content Manager",
@ -32,8 +32,8 @@
"redux-immutable": "^4.0.0",
"reselect": "^3.0.1",
"showdown": "^1.9.0",
"strapi-helper-plugin": "3.0.0-beta.13",
"strapi-utils": "3.0.0-beta.13",
"strapi-helper-plugin": "3.0.0-beta.14",
"strapi-utils": "3.0.0-beta.14",
"styled-components": "^4.2.0",
"yup": "^0.27.0"
},

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-content-type-builder",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Strapi plugin to create content type (API).",
"strapi": {
"name": "Content Type Builder",
@ -29,9 +29,9 @@
"redux": "^4.0.1",
"redux-immutable": "^4.0.0",
"reselect": "^3.0.1",
"strapi-generate": "3.0.0-beta.13",
"strapi-generate-api": "3.0.0-beta.13",
"strapi-helper-plugin": "3.0.0-beta.13",
"strapi-generate": "3.0.0-beta.14",
"strapi-generate-api": "3.0.0-beta.14",
"strapi-helper-plugin": "3.0.0-beta.14",
"yup": "^0.27.0"
},
"author": {

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-documentation",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Documentation",
@ -33,7 +33,7 @@
"redux": "^4.0.1",
"redux-immutable": "^4.0.0",
"reselect": "^4.0.0",
"strapi-helper-plugin": "3.0.0-beta.13",
"strapi-helper-plugin": "3.0.0-beta.14",
"swagger-ui-dist": "3.22.1"
},
"author": {

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-email",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Email",
@ -12,13 +12,13 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"strapi-provider-email-sendmail": "3.0.0-beta.13",
"strapi-utils": "3.0.0-beta.13"
"strapi-provider-email-sendmail": "3.0.0-beta.14",
"strapi-utils": "3.0.0-beta.14"
},
"devDependencies": {
"react-copy-to-clipboard": "5.0.1",
"rimraf": "^2.6.3",
"strapi-helper-plugin": "3.0.0-beta.13"
"strapi-helper-plugin": "3.0.0-beta.14"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-graphql",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "This is the description of the plugin.",
"strapi": {
"name": "graphql",
@ -23,7 +23,7 @@
"graphql-type-long": "^0.1.1",
"koa-compose": "^4.0.0",
"pluralize": "^7.0.0",
"strapi-utils": "3.0.0-beta.13"
"strapi-utils": "3.0.0-beta.14"
},
"devDependencies": {
"cross-env": "^5.2.0",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-settings-manager",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Strapi plugin to manage settings.",
"strapi": {
"name": "Settings Manager",
@ -27,7 +27,7 @@
"redux": "^4.0.1",
"reselect": "^3.0.1",
"shelljs": "^0.7.8",
"strapi-helper-plugin": "3.0.0-beta.13"
"strapi-helper-plugin": "3.0.0-beta.14"
},
"author": {
"name": "Strapi team",

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-upload",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "This is the description of the plugin.",
"strapi": {
"name": "Files Upload",
@ -23,9 +23,9 @@
"react-router-dom": "^5.0.0",
"react-transition-group": "^2.5.0",
"reactstrap": "^5.0.0",
"strapi-helper-plugin": "3.0.0-beta.13",
"strapi-provider-upload-local": "3.0.0-beta.13",
"strapi-utils": "3.0.0-beta.13",
"strapi-helper-plugin": "3.0.0-beta.14",
"strapi-provider-upload-local": "3.0.0-beta.14",
"strapi-utils": "3.0.0-beta.14",
"stream-to-array": "^2.3.0",
"uuid": "^3.2.1"
},

View File

@ -6,7 +6,7 @@ module.exports = {
},
definition: `
type UsersPermissionsMe {
_id: ID!
id: ID!
username: String!
email: String!
confirmed: Boolean
@ -15,7 +15,7 @@ module.exports = {
}
type UsersPermissionsMeRole {
_id: ID!
id: ID!
name: String!
description: String
type: String
@ -25,6 +25,11 @@ module.exports = {
me: UsersPermissionsMe
`,
resolver: {
UsersPermissionsMe: {
id(obj) {
return obj.id || obj._id;
},
},
Query: {
me: {
resolverOf: 'User.me',

View File

@ -1,6 +1,6 @@
{
"name": "strapi-plugin-users-permissions",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Protect your API with a full-authentication process based on JWT",
"strapi": {
"name": "Roles & Permissions",
@ -31,8 +31,8 @@
"reactstrap": "^5.0.0",
"redux-saga": "^0.16.0",
"request": "^2.83.0",
"strapi-helper-plugin": "3.0.0-beta.13",
"strapi-utils": "3.0.0-beta.13",
"strapi-helper-plugin": "3.0.0-beta.14",
"strapi-utils": "3.0.0-beta.14",
"uuid": "^3.1.0"
},
"devDependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-email-amazon-ses",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Amazon SES provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-email-mailgun",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Mailgun provider for strapi email plugin",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-email-sendgrid",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Sendgrid provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-email-sendmail",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Sendmail provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-upload-aws-s3",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "AWS S3 provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-upload-cloudinary",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Cloudinary provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-upload-local",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Local provider for strapi upload",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi-provider-upload-rackspace",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Rackspace provider for strapi upload",
"main": "./lib",
"keywords": [],

View File

@ -1,6 +1,6 @@
{
"name": "strapi-utils",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "Shared utilities for the Strapi packages",
"homepage": "http://strapi.io",
"keywords": [

View File

@ -1,6 +1,6 @@
{
"name": "strapi",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"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",
"directories": {
@ -47,15 +47,15 @@
"resolve-cwd": "^3.0.0",
"rimraf": "^2.6.2",
"shelljs": "^0.8.3",
"strapi-generate": "3.0.0-beta.13",
"strapi-generate-api": "3.0.0-beta.13",
"strapi-generate-controller": "3.0.0-beta.13",
"strapi-generate-model": "3.0.0-beta.13",
"strapi-generate-new": "3.0.0-beta.13",
"strapi-generate-plugin": "3.0.0-beta.13",
"strapi-generate-policy": "3.0.0-beta.13",
"strapi-generate-service": "3.0.0-beta.13",
"strapi-utils": "3.0.0-beta.13"
"strapi-generate": "3.0.0-beta.14",
"strapi-generate-api": "3.0.0-beta.14",
"strapi-generate-controller": "3.0.0-beta.14",
"strapi-generate-model": "3.0.0-beta.14",
"strapi-generate-new": "3.0.0-beta.14",
"strapi-generate-plugin": "3.0.0-beta.14",
"strapi-generate-policy": "3.0.0-beta.14",
"strapi-generate-service": "3.0.0-beta.14",
"strapi-utils": "3.0.0-beta.14"
},
"scripts": {
"test": "jest --verbose",