Merge docs-next with main docs

docs/.vuepress/config/sidebar-developer.js

@@ -105,7 +105,11 @@ const developer = [
                 '/developer-docs/latest/setup-deployment-guides/configurations/optional/rbac.md',
                 'Role-Based Access Control (RBAC)',
               ],
+              [
+                '/developer-docs/latest/setup-deployment-guides/configurations/optional/typescript.md',
+                'TypeScript',
             ],
+          ],
           },
         ],
       },
@@ -222,6 +226,7 @@ const developer = [
       ['/developer-docs/latest/development/admin-customization', 'Admin panel customization'],
       ['/developer-docs/latest/development/plugins-extension.md', 'Plugins extension'],
       ['/developer-docs/latest/development/plugins-development.md', 'Plugins development'],
+      ['/developer-docs/latest/development/typescript.md', 'TypeScript'],
       ['/developer-docs/latest/development/providers.md', 'Providers'],
     ],
   },

docs/.vuepress/config/sidebar-user.js

@@ -52,6 +52,28 @@ const user = [
       ],
     ],
   },
+  {
+    collapsable: false,
+    title: 'Media Library',
+    children: [
+      [
+        '/user-docs/latest/media-library/introduction-to-media-library.md',
+        'Introduction to the Media Library'
+      ],
+      [
+        '/user-docs/latest/media-library/adding-assets.md',
+        'Adding assets'
+      ],
+      [
+        '/user-docs/latest/media-library/managing-assets.md',
+        'Managing individual assets'
+      ],
+      [
+        '/user-docs/latest/media-library/organizing-assets-with-folders.md',
+        'Organizing assets with folders'
+      ],
+    ]
+  },
   {
     collapsable: false,
     title: 'Users, Roles & Permissions',
@@ -101,4 +123,4 @@ const user = [
       ],
     ],
   },
-];
+];

docs/.vuepress/config/theme-config.js

@@ -58,6 +58,11 @@ const themeConfig = {
               link:
                 '/user-docs/latest/users-roles-permissions/introduction-to-users-roles-permissions.html',
             },
+            {
+              text: 'Media Library',
+              link:
+                '/user-docs/latest/media-library/introduction-to-media-library.html',
+            },
             {
               text: 'Plugins',
               link: '/user-docs/latest/plugins/introduction-to-plugins.html',

docs/developer-docs/latest/developer-resources/cli/CLI.md

@@ -6,7 +6,7 @@ canonicalUrl: https://docs.strapi.io/developer-docs/latest/developer-resources/c
 
 # Command Line Interface (CLI)
 
-Strapi comes with a full featured Command Line Interface (CLI) which lets you scaffold and manage your project in seconds. 
+Strapi comes with a full featured Command Line Interface (CLI) which lets you scaffold and manage your project in seconds.
 
 ::: note
 It is recommended to install Strapi locally only, which requires prefixing all of the following `strapi` commands with the package manager used for the project setup (e.g `npm run strapi help` or `yarn strapi help`) or a dedicated node package executor (e.g. `npx strapi help`).
@@ -222,15 +222,15 @@ strapi admin:reset-user-password --email=chef@strapi.io --password=Gourmet1234
 
 ## strapi generate
 
-Run a fully interactive CLI to generate APIs, [controllers](/developer-docs/latest/development/backend-customization/controllers.md), [content-types](/developer-docs/latest/development/backend-customization/models.md), [plugins](/developer-docs/latest/development/plugins-development.md#creating-a-plugin), [policies](/developer-docs/latest/development/backend-customization/policies.md), [middlewares](/developer-docs/latest/development/backend-customization/middlewares.md) and [services](/developer-docs/latest/development/backend-customization/services.md).
+Run a fully interactive CLI to generate APIs, [controllers](/developer-docs/latest/development/backend-customization/controllers.md), [content-types](/developer-docs/latest/development/backend-customization/models.md), [plugins](/developer-docs/latest/development/plugins-development.md#create-a-plugin), [policies](/developer-docs/latest/development/backend-customization/policies.md), [middlewares](/developer-docs/latest/development/backend-customization/middlewares.md) and [services](/developer-docs/latest/development/backend-customization/services.md).
 
 ```sh
 strapi generate
 ```
 
 ## strapi templates:generate
 
-Create a template from the current strapi project
+Create a template from the current Strapi project.
 
 ```bash
 strapi templates:generate <path>
@@ -241,6 +241,23 @@ strapi templates:generate <path>
 
   Example: `strapi templates:generate ../strapi-template-name` will copy the required files and folders to a `template` directory inside `../strapi-template-name`
 
+## strapi ts:generate-types
+
+Generate [TypeScript](/developer-docs/latest/development/typescript.md) typings for the project schemas.
+
+```sh
+strapi ts:generate-types
+```
+
+* **strapi ts:generate-types --verbose**<br/>
+  Generate typings with the verbose mode enabled, displaying a detailed table of the generated schemas.
+* **strapi ts:generate-types --silent** or **strapi ts:generate-types -s**<br/>
+  Generate typings with the silent mode enabled, completely removing all the logs in the terminal.
+* **strapi ts:generate-types --out-dir &#60;path&#62;** or **strapi ts:generate-types -o &#60;path&#62;**<br/>
+  Generate typings specifying the output directory in which the file will be created.
+* **strapi ts:generate-types --file &#60;filename&#62;** or **strapi ts:generate-types -f &#60;filename&#62;**<br/>
+  Generate typings specifiying the name of the file to contain the types declarations.
+
 ## strapi routes:list
 
 Display a list of all the available [routes](/developer-docs/latest/development/backend-customization/routes.md).

docs/developer-docs/latest/developer-resources/error-handling.md

@@ -70,6 +70,9 @@ Error functions accept 2 parameters that correspond to the `error.message` and `
 - the first parameter of the function is the error `message`
 - and the second one is the object that will be set as `details` in the response received
 
+<code-group>
+<code-block title="JAVASCRIPT">
+
 ```js
 
 // path: ./src/api/[api-name]/controllers/my-controller.js
@@ -86,6 +89,32 @@ module.exports = {
 
 ```
 
+
+</code-block>
+
+<code-block title="TYPESCRIPT">
+
+
+```js
+
+// path: ./src/api/[api-name]/controllers/my-controller.ts
+
+export default {
+  renameDog: async (ctx, next) => {
+    const newName = ctx.request.body.name;
+    if (!newName) {
+      return ctx.badRequest('name is missing', { foo: 'bar' })
+    }
+    ctx.body = strapi.service('api::dog.dog').rename(newName);
+  }
+}
+
+```
+
+</code-block>
+</code-group>
+
+
 :::note
 [Services](/developer-docs/latest/development/backend-customization/services.md) don't have access to the controller's `ctx` object. If services need to throw errors, these need to be caught by the controller, that in turn is in charge of calling the proper error function.
 :::