chore(): resolved conflicts

Author: Tony133

content/cli/workspaces.md

@@ -192,7 +192,7 @@ These properties specify the compiler to use as well as various options that aff
 | `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`.                                                                                                                                                                            |
-| `builder`           | string              | Instructs CLI on what `builder` to use to compile the project (`tsc`, `swc`, or `webpack`)                                                                                                                                                                                |
+| `builder`           | string/object       | Instructs CLI on what `builder` to use to compile the project (`tsc`, `swc`, or `webpack`). To customize builder's behavior, you can pass an object containing two attributes: `type` (`tsc`, `swc`, or `webpack`) and `options`.                                         |
 | `typeCheck`         | boolean             | If `true`, enables type checking for SWC-driven projects (when `builder` is `swc`). Default value is `false`.                                                                                                                                                             |
 
 #### Global generate options

content/discover/who-uses.json

@@ -36,169 +36,57 @@
       "url": "https://www.neo4j.com/"
     },
     {
-      "logo": "/assets/logo/shipt.png",
-      "url": "https://www.shipt.com/"
-    },
-    {
-      "logo": "/assets/logo/sanofi.png",
-      "url": "https://github.com/Sanofi-IADC"
-    },
-    {
-      "logo": "https://nestjs.com/img/valor-software.png",
-      "url": "https://valor-software.com/"
-    },
-    {
-      "logo": "/assets/logo/sitepen.svg",
-      "url": "https://sitepen.com"
-    },
-    {
-      "logo": "https://nestjs.com/img/gojob-logo.png",
-      "url": "https://gojob.com/",
-      "width": "100px"
-    },
-    {
-      "logo": "https://nestjs.com/img/neoteric.png",
-      "url": "https://neoteric.eu/"
-    },
-    {
-      "logo": "/assets/logo/trellis.png",
-      "url": "https://trellis.org/",
-      "width": "70px"
+      "logo": "/assets/logo/bmw.svg",
+      "url": "https://bmw.com"
     },
     {
-      "logo": "https://nestjs.com/img/scalio-logo.svg",
-      "url": "https://scal.io",
-      "width": "120px"
-    },
-    {
-      "logo": "https://nestjs.com/img/swingdev-logo.svg",
-      "url": "https://swingdev.io/"
-    },
-    {
-      "logo": "/assets/logo/cultura-colectiva.png",
-      "url": "https://culturacolectiva.com",
-      "width": "90px"
-    },
-    {
-      "logo": "https://nestjs.com/img/trilon.png",
-      "url": "https://trilon.io"
+      "logo": "/assets/logo/gitlab.png",
+      "url": "https://gitlab.com/"
     },
     {
-      "logo": "/assets/logo/architectnow.png",
-      "url": "http://architectnow.net",
-      "width": "150px"
+      "logo": "/assets/logo/ibm.svg",
+      "url": "https://www.ibm.com/"
     },
     {
-      "logo": "/assets/logo/iflix.svg",
-      "url": "https://www.iflix.com",
-      "width": "70px"
+      "logo": "/assets/logo/jetbrains.svg",
+      "url": "https://www.jetbrains.com/"
     },
     {
-      "logo": "https://nestjs.com/img/genuinebee.svg",
-      "url": "https://genuinebee.com/"
+      "logo": "/assets/logo/mercedes.png",
+      "url": "https://www.mercedes-benz.com/"
     },
     {
-      "logo": "/assets/logo/run-players-league.png",
-      "url": "https://runplayersleague.com",
-      "width": "80px"
+      "logo": "/assets/logo/totalenergies.svg",
+      "url": "https://totalenergies.com/"
     },
     {
-      "logo": "/assets/logo/yanrongyun.svg",
-      "url": "http://www.yanrongyun.com",
-      "width": "120px"
+      "logo": "/assets/logo/bytedance.png",
+      "url": "https://www.bytedance.com"
     },
     {
-      "logo": "/assets/logo/sclable.svg",
-      "url": "https://sclable.com",
-      "width": "120px"
-    },
-    {
-      "logo": "/assets/logo/dozto.png",
-      "url": "https://www.dozto.com",
-      "width": "117px"
-    },
-    {
-      "logo": "/assets/logo/qingtui.png",
-      "url": "https://www.qingtui.cn/",
-      "width": "90px"
+      "logo": "/assets/logo/ibm.svg",
+      "url": "https://www.ibm.com/"
     },
     {
-      "logo": "/assets/logo/crowdlinker.svg",
-      "url": "https://crowdlinker.com/",
-      "width": "110px"
-    },
-    {
-      "logo": "/assets/logo/nothing.svg",
-      "url": "https://nothing.ch/",
-      "width": "110px"
-    },
-    {
-      "logo": "/assets/logo/swissdevjobs-devops-logo.png",
-      "url": "https://swissdevjobs.ch/jobs/Dev-Ops/All",
-      "width": "65px"
-    },
-    {
-      "logo": "/assets/logo/zeoagency.svg",
-      "url": "https://zeo.org/tr/",
-      "width": "80px"
-    },
-    {
-      "logo": "/assets/logo/valueadd.png",
-      "url": "https://valueadd.pl/",
-      "width": "120px"
-    },
-    {
-      "logo": "/assets/logo/bedu.svg",
-      "url": "https://bedu.org",
-      "width": "100px"
-    },
-    {
-      "logo": "/assets/logo/shopback.png",
-      "url": "https://shopback.com",
-      "width": "100px"
-    },
-    {
-      "logo": "/assets/logo/facile.png",
-      "url": "https://www.facile.it",
-      "width": "100px"
-    },
-    {
-      "logo": "/assets/logo/interfacewerk.png",
-      "url": "https://interfacewerk.de",
-      "width": "130px"
-    },
-    {
-      "logo": "/assets/logo/ottonova.png",
-      "url": "https://www.ottonova.de",
-      "width": "130px"
+      "logo": "/assets/logo/shipt.png",
+      "url": "https://www.shipt.com/"
     },
     {
-      "logo": "/assets/logo/radity.png",
-      "url": "https://radity.com",
-      "width": "120px"
+      "logo": "/assets/logo/sanofi.png",
+      "url": "https://github.com/Sanofi-IADC"
     },
     {
-      "logo": "/assets/logo/global-cto-forum.png",
-      "url": "https://globalctoforum.org/",
-      "width": "120px"
+      "logo": "/assets/logo/sitepen.svg",
+      "url": "https://sitepen.com"
     },
     {
-      "logo": "/assets/logo/rivvy.png",
-      "url": "https://rivvy.app",
-      "width": "120px"
+      "logo": "https://nestjs.com/img/trilon.png",
+      "url": "https://trilon.io"
     },
     {
       "logo": "/assets/logo/vue-storefront.png",
       "url": "https://www.vuestorefront.io/"
     },
-    {
-      "logo": "/assets/logo/fuse-logo.svg",
-      "url": "https://fuseautotech.com"
-    },
-    {
-      "logo": "/assets/logo/amplication.svg",
-      "url": "https://amplication.com"
-    },
     {
       "logo": "/assets/logo/hingehealth.png",
       "url": "https://hingehealth.com",

content/migration.md

@@ -4,23 +4,23 @@ This article provides a set of guidelines for migrating from Nest version 9 to v
 To learn more about the new features we've added in v10, check out this [article](https://trilon.io/blog/nestjs-10-is-now-available).
 There were some very minor breaking changes that shouldn't affect most users - you can find the full list of them [here](https://github.com/nestjs/nest/releases/tag/v10.0.0).
 
-### Upgrading packages
+#### Upgrading packages
 
 While you can upgrade your packages manually, we recommend using [ncu (npm check updates)](https://npmjs.com/package/npm-check-updates).
 
-### Cache module
+#### Cache module
 
 The `CacheModule` has been removed from the `@nestjs/common` package and is now available as a standalone package - `@nestjs/cache-manager`. This change was made to avoid unnecessary dependencies in the `@nestjs/common` package. You can learn more about the `@nestjs/cache-manager` package [here](https://docs.nestjs.com/techniques/caching).
 
-### Deprecations
+#### Deprecations
 
 All deprecated methods & modules have been removed.
 
-### CLI Plugins and TypeScript >= 4.8
+#### CLI Plugins and TypeScript >= 4.8
 
 NestJS CLI Plugins (available for `@nestjs/swagger` and `@nestjs/graphql` packages) will now require TypeScript >= v4.8 and so older versions of TypeScript will no longer be supported. The reason for this change is that in [TypeScript v4.8 introduced several breaking changes](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-4-8.html#decorators-are-placed-on-modifiers-on-typescripts-syntax-trees) in its Abstract Syntax Tree (AST) which we use to auto-generate OpenAPI and GraphQL schemas.
 
-### Dropping support for Node.js v12
+#### Dropping support for Node.js v12
 
 As of NestJS 10, we no longer support Node.js v12, as [v12 went EOL](https://twitter.com/nodejs/status/1524081123579596800) on April 30, 2022. This means that NestJS 10 requires Node.js v16 or higher. This decision was made to allow us to finally set target to `ES2021` in our TypeScript configuration, instead of shipping polyfills as we did in the past.
 

content/recipes/swc.md

@@ -34,6 +34,19 @@ Instead of passing the `-b` flag you can also just set the `compilerOptions.buil
 }
 ```
 
+To customize builder's behavior, you can pass an object containing two attributes, `type` (`"swc"`) and `options`, as follows:
+
+```json
+"compilerOptions": {
+  "builder": {
+    "type": "swc",
+    "options": {
+      "swcrcPath": "infrastructure/.swcrc",
+    }
+  }
+}
+```
+
 To run the application in watch mode, use the following command:
 
 ```bash

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. [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.
+For integrating with SQL and NoSQL databases, Nest provides the `@nestjs/typeorm` package. [TypeORM](https://github.com/typeorm/typeorm) is 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.
 

src/app/homepage/homepage.component.html

@@ -33,17 +33,17 @@ <h4 class="title">Principal Sponsors</h4>
                 class="logo-sponsor"
               />
             </a>
-            <a href="https://www.redhat.com/" target="_blank" class="logo-sponsor-container">
+            <!-- <a href="https://www.redhat.com/" target="_blank" class="logo-sponsor-container">
               <img src="/assets/sponsors/red-hat-logo.svg" alt="Red Hat Logo" class="logo-sponsor" />
-            </a>
+            </a> -->
             <a href="https://valor-software.com/" target="_blank" class="logo-sponsor-container">
               <img
                 src="/assets/sponsors/valor-software.png"
                 alt="Valor Software Logo"
                 class="logo-sponsor logo-sponsor--high"
               />
             </a>
-            <a href="https://github.com/Sanofi-IADC" target="_blank" class="logo-sponsor-container">
+            <!-- <a href="https://github.com/Sanofi-IADC" target="_blank" class="logo-sponsor-container">
               <img
                 src="/assets/sponsors/sanofi.png"
                 alt="Sanofi Logo"
@@ -63,7 +63,7 @@ <h4 class="title">Principal Sponsors</h4>
                 alt="Amplication Logo"
                 class="logo-sponsor"
               />
-            </a>
+            </a> -->
           </div>
           <div class="inline-column">
             <h4 class="title">Sponsors / Partners</h4>

src/app/homepage/homepage.component.scss

@@ -198,7 +198,7 @@
   }
 
   .logo-sponsor--high {
-    width: 160px;
+    width: 140px;
   }
 
   .logo-sponsor--slim {
@@ -401,11 +401,12 @@
 
 .company-logo img {
   max-width: 130px;
-  max-height: 90px;
+  max-height: 60px;
+  padding: 6px;
   -webkit-filter: var(--company-filter);
   filter: var(--company-filter);
   opacity: var(--company-logo-opacity);
-
+  
   &:hover {
     -webkit-filter: var(--company-filter-hover);
     filter: var(--company-filter-hover);

src/app/homepage/pages/cli/cli.module.ts

@@ -20,7 +20,7 @@ const routes: Routes = [
     path: 'monorepo',
     component: CliWorkspacesComponent,
     data: {
-      title: 'Monorepo - CLI',
+      title: 'Workspaces - CLI',
     },
   },
   {