chore(): resolved conflicts

Author: Tony133

README.md

@@ -2,11 +2,6 @@
   <a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="120" alt="Nest Logo" /></a>
 </p>
 
-[travis-image]: https://api.travis-ci.org/nestjs/nest.svg?branch=master
-[travis-url]: https://travis-ci.org/nestjs/nest
-[linux-image]: https://img.shields.io/travis/nestjs/nest/master.svg?label=linux
-[linux-url]: https://travis-ci.org/nestjs/nest
-
   <p align="center">A progressive <a href="http://nodejs.org" target="_blank">Node.js</a> framework for building efficient and scalable server-side applications.</p>
     <p align="center">
 <a href="https://www.npmjs.com/~nestjscore"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>

content/cli/overview.md

@@ -2,19 +2,27 @@
 
 The [Nest CLI](https://github.com/nestjs/nest-cli) is a command-line interface tool that helps you to initialize, develop, and maintain your Nest applications. It assists in multiple ways, including scaffolding the project, serving it in development mode, and building and bundling the application for production distribution. It embodies best-practice architectural patterns to encourage well-structured apps.
 
-#### Installation
+#### Requirements
 
-**Note**: In this guide we describe using [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm) to install packages, including the Nest CLI. Other package managers may be used at your discretion. With npm, you have several options available for managing how your OS command line resolves the location of the `nest` CLI binary file. Here, we describe installing the `nest` binary globally using the `-g` option. This provides a measure of convenience, and is the approach we assume throughout the documentation. Note that installing **any** `npm` package globally leaves the responsibility of ensuring they're running the correct version up to the user. It also means that if you have different projects, each will run the **same** version of the CLI. A reasonable alternative is to use the [npx](https://github.com/npm/cli/blob/latest/docs/lib/content/commands/npx.md) program, built into the `npm` cli (or similar features with other package managers) to ensure that you run a **managed version** of the Nest CLI. We recommend you consult the [npx documentation](https://github.com/npm/cli/blob/latest/docs/lib/content/commands/npx.md) and/or your DevOps support staff for more information.
+Nest CLI requires a Node.js binary built with [internationalization support](https://nodejs.org/api/intl.html) (ICU), such as the official binaries from the [Node.js project page](https://nodejs.org/en/download). If you encounter errors related to ICU, check that your binary meets this requirement.
+
+```bash
+node -p process.versions.icu
+```
+
+If the command prints `undefined`, your Node.js binary has no internationalization support.
 
+#### Installation
 
+**Note**: In this guide we describe using [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm) to install packages, including the Nest CLI. Other package managers may be used at your discretion. With npm, you have several options available for managing how your OS command line resolves the location of the `nest` CLI binary file. Here, we describe installing the `nest` binary globally using the `-g` option. This provides a measure of convenience, and is the approach we assume throughout the documentation. Note that installing **any** `npm` package globally leaves the responsibility of ensuring they're running the correct version up to the user. It also means that if you have different projects, each will run the **same** version of the CLI. A reasonable alternative is to use the [npx](https://github.com/npm/cli/blob/latest/docs/lib/content/commands/npx.md) program, built into the `npm` cli (or similar features with other package managers) to ensure that you run a **managed version** of the Nest CLI. We recommend you consult the [npx documentation](https://github.com/npm/cli/blob/latest/docs/lib/content/commands/npx.md) and/or your DevOps support staff for more information.
 
 Install the CLI globally using the `npm install -g` command (see the **Note** above for details about global installs).
 
 ```bash
 $ npm install -g @nestjs/cli
 ```
 
-> info **Hint** Alternatively, you can use this command `npx @nestjs/cli@latest` without installing the cli globally. 
+> info **Hint** Alternatively, you can use this command `npx @nestjs/cli@latest` without installing the cli globally.
 
 #### Basic workflow
 
@@ -90,11 +98,11 @@ Run `nest <command> --help` for any of the following commands to see command-spe
 
 See [usage](/cli/usages) for detailed descriptions for each command.
 
-| Command    | Alias | Description                                                                                           |
-| ---------- | ----- | ----------------------------------------------------------------------------------------------------- |
-| `new`      | `n`   | Scaffolds a new _standard mode_ application with all boilerplate files needed to run.                 |
-| `generate` | `g`   | Generates and/or modifies files based on a schematic.                                                 |
-| `build`    |       | Compiles an application or workspace into an output folder.                                           |
-| `start`    |       | Compiles and runs an application (or default project in a workspace).                                 |
-| `add`      |       | Imports a library that has been packaged as a **nest library**, running its install schematic.        |
-| `info`     | `i`   | Displays information about installed nest packages and other helpful system info.                     |
+| Command    | Alias | Description                                                                                    |
+| ---------- | ----- | ---------------------------------------------------------------------------------------------- |
+| `new`      | `n`   | Scaffolds a new _standard mode_ application with all boilerplate files needed to run.          |
+| `generate` | `g`   | Generates and/or modifies files based on a schematic.                                          |
+| `build`    |       | Compiles an application or workspace into an output folder.                                    |
+| `start`    |       | Compiles and runs an application (or default project in a workspace).                          |
+| `add`      |       | Imports a library that has been packaged as a **nest library**, running its install schematic. |
+| `info`     | `i`   | Displays information about installed nest packages and other helpful system info.              |

content/cli/workspaces.md

@@ -191,6 +191,7 @@ These properties specify the compiler to use as well as various options that aff
 | `deleteOutDir`      | boolean             | If `true`, whenever the compiler is invoked, it will first remove the compilation output directory (as configured in `tsconfig.json`, where the default is `./dist`).                                                                 |
 | `assets`            | array               | Enables automatically distributing non-TypeScript assets whenever a compilation step begins (asset distribution does **not** happen on incremental compiles in `--watch` mode). See below for details.                                |
 | `watchAssets`       | boolean             | If `true`, run in watch-mode, watching **all** non-TypeScript assets. (For more fine-grained control of the assets to watch, see [Assets](cli/monorepo#assets) section below).                                                        |
+| `manualRestart`     | boolean             | If `true`, enables the shortcut `rs` to manually restart the server. Default value is `false`.                                                                                                                                        |
 
 #### Global generate options
 

content/controllers.md

@@ -37,7 +37,7 @@ export class CatsController {
 }
 ```
 
-> info **Hint** To create a controller using the CLI, simply execute the `$ nest g controller cats` command.
+> info **Hint** To create a controller using the CLI, simply execute the `$ nest g controller [name]` command.
 
 The `@Get()` HTTP request method decorator before the `findAll()` method tells Nest to create a handler for a specific endpoint for HTTP requests. The endpoint corresponds to the HTTP request method (GET in this case) and the route path. What is the route path? The route path for a handler is determined by concatenating the (optional) prefix declared for the controller, and any path specified in the method's decorator. Since we've declared a prefix for every route ( `cats`), and haven't added any path information in the decorator, Nest will map `GET /cats` requests to this handler. As mentioned, the path includes both the optional controller path prefix **and** any path string declared in the request method decorator. For example, a path prefix of `cats` combined with the decorator `@Get('breed')` would produce a route mapping for requests like `GET /cats/breed`.
 

content/graphql/quick-start.md

@@ -69,7 +69,6 @@ import { ApolloDriver, ApolloDriverConfig } from '@nestjs/apollo';
   imports: [
     GraphQLModule.forRoot<ApolloDriverConfig>({
       driver: ApolloDriver,
-      debug: false,
       playground: false,
     }),
   ],

content/recipes/automock.md

@@ -71,11 +71,11 @@ describe('CatsService unit spec', () => {
   beforeAll(() => {
     const { unit, unitRef } = TestBed.create(CatsService)
       .mock(HttpService)
-      .use({ get: jest.fn() })
+      .using({ get: jest.fn() })
       .mock(Logger)
-      .use({ log: jest.fn() })
+      .using({ log: jest.fn() })
       .mock(CatsDal)
-      .use({ saveCats: jest.fn() })
+      .using({ saveCats: jest.fn() })
       .compile();
 
     underTest = unit;

content/recipes/swc.md

@@ -121,7 +121,13 @@ export default defineConfig({
     globals: true,
     root: './',
   },
-  plugins: [swc.vite()], // This is required to build the test files with SWC
+  plugins: [
+    // This is required to build the test files with SWC
+    swc.vite({
+      // Explicitly set the module type to avoid inheriting this value from a `.swcrc` config file
+      module: { type: 'es6' },
+    }),
+  ],
 });
 ```
 

content/techniques/cookies.md

@@ -14,7 +14,7 @@ $ npm i -D @types/cookie-parser
 Once the installation is complete, apply the `cookie-parser` middleware as global middleware (for example, in your `main.ts` file).
 
 ```typescript
-import * as cookieParser from 'cookie-parser';
+import cookieParser from 'cookie-parser';
 // somewhere in your initialization file
 app.use(cookieParser());
 ```

content/techniques/queues.md

@@ -99,8 +99,8 @@ With this in place, you can now point to this configuration in the `registerQueu
 
 ```typescript
 BullModule.registerQueue({
-  configKey: 'alternative-queue',
-  name: 'video',
+  configKey: 'alternative-config',
+  name: 'video'
 });
 ```
 

content/techniques/sql.md

@@ -8,7 +8,7 @@ For convenience, Nest provides tight integration with TypeORM and Sequelize out-
 
 ### TypeORM Integration
 
-For integrating with SQL and NoSQL databases, Nest provides the `@nestjs/typeorm` package. Nest uses [TypeORM](https://github.com/typeorm/typeorm) because it's the most mature Object Relational Mapper (ORM) available for TypeScript. Since it's written in TypeScript, it integrates well with the Nest framework.
+For integrating with SQL and NoSQL databases, Nest provides the `@nestjs/typeorm` package. [TypeORM](https://github.com/typeorm/typeorm) it's the most mature Object Relational Mapper (ORM) available for TypeScript. Since it's written in TypeScript, it integrates well with the Nest framework.
 
 To begin using it, we first install the required dependencies. In this chapter, we'll demonstrate using the popular [MySQL](https://www.mysql.com/) Relational DBMS, but TypeORM provides support for many relational databases, such as PostgreSQL, Oracle, Microsoft SQL Server, SQLite, and even NoSQL databases like MongoDB. The procedure we walk through in this chapter will be the same for any database supported by TypeORM. You'll simply need to install the associated client API libraries for your selected database.
 
@@ -655,7 +655,7 @@ The construction above will instantiate `TypeOrmConfigService` inside `TypeOrmMo
 
 ```typescript
 @Injectable()
-class TypeOrmConfigService implements TypeOrmOptionsFactory {
+export class TypeOrmConfigService implements TypeOrmOptionsFactory {
   createTypeOrmOptions(): TypeOrmModuleOptions {
     return {
       type: 'mysql',