Fixed merge conflict in menu.component.ts

Author: maayanbar13

.commitlintrc.json

@@ -0,0 +1,28 @@
+{
+  "extends": ["@commitlint/config-angular"],
+  "rules": {
+    "subject-case": [
+      2,
+      "always",
+      ["sentence-case", "start-case", "pascal-case", "upper-case", "lower-case"]
+    ],
+    "type-enum": [
+      2,
+      "always",
+      [
+        "build",
+        "chore",
+        "ci",
+        "docs",
+        "feat",
+        "fix",
+        "perf",
+        "refactor",
+        "revert",
+        "style",
+        "test",
+        "sample"
+      ]
+    ]
+  }
+}

.github/ISSUE_TEMPLATE.md

@@ -5,16 +5,16 @@ ISSUES MISSING IMPORTANT INFORMATION MAY BE CLOSED WITHOUT INVESTIGATION.
 -->
 
 ## I'm submitting a...
-<!-- 
+<!--
 Please search GitHub for a similar issue or PR before submitting.
 Check one of the following options with "x" -->
-<pre><code>
-[ ] Regression <!--(a behavior that used to work and stopped working in a new release)-->
-[ ] Bug report
-[ ] Feature request
-[ ] Documentation issue or request (new chapter/page)
-[ ] Support request => Please do not submit support request here, instead post your question on Stack Overflow.
-</code></pre>
+
+- [ ] Regression <!--(a behavior that used to work and stopped working in a new release)-->
+- [ ] Bug report
+- [ ] Feature request
+- [ ] Documentation issue or request (new chapter/page)
+- [ ] Support request => Please do not submit support request here, instead post your question on Stack Overflow.
+
 
 ## Current behavior
 <!-- Describe how the issue manifests. -->
@@ -33,11 +33,12 @@ Check one of the following options with "x" -->
 
 ## Environment
 
-<pre><code>
-For Tooling issues:
-- Node version: XX  <!-- run `node --version` -->
-- Platform:  <!-- Mac, Linux, Windows -->
+#### For Tooling issues:
+<!-- Run `node --version` -->
+- Node version: XX
+
+<!-- Mac, Linux, Windows -->
+- Platform:
 
-Others:
+#### Others:
 <!-- Anything else relevant?  Operating system version, IDE, package manager, ... -->
-</code></pre>

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,15 +8,15 @@ Please check if your PR fulfills the following requirements:
 What kind of change does this PR introduce?
 
 <!-- Please check the one that applies to this PR using "x". -->
-```
-[ ] Bugfix
-[ ] Feature
-[ ] Code style update (formatting, local variables)
-[ ] Refactoring (no functional changes, no api changes)
-[ ] Build related changes
-[ ] Docs
-[ ] Other... Please describe:
-```
+
+- [ ] Bugfix
+- [ ] Feature
+- [ ] Code style update (formatting, local variables)
+- [ ] Refactoring (no functional changes, no api changes)
+- [ ] Build related changes
+- [ ] Docs
+- [ ] Other... Please describe:
+
 
 ## What is the current behavior?
 <!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
@@ -28,10 +28,9 @@ Issue Number: N/A
 
 
 ## Does this PR introduce a breaking change?
-```
-[ ] Yes
-[ ] No
-```
+- [ ] Yes
+- [ ] No
+
 
 <!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. -->
 

.github/workflows/lighthouse.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Use Node.js 12.x
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: 12.x
       # Build needs around 400 seconds on Netlify.
@@ -28,7 +28,7 @@ jobs:
           site_name: 'docs-nestjs'
           max_timeout: 600
       - name: Run Lighthouse on urls and validate with lighthouserc
-        uses: treosh/lighthouse-ci-action@v2
+        uses: treosh/lighthouse-ci-action@v8
         with:
           urls: |
             ${{ steps.wait-for-netflify-preview.outputs.url }}

.gitignore

@@ -5,6 +5,7 @@ dist/*
 !/dist/v4
 !/dist/v5
 !/dist/v6
+!/dist/v7
 
 /tmp
 /out-tsc
@@ -39,7 +40,7 @@ dist/*
 npm-debug.log
 testem.log
 /typings
-
+.angular
 # e2e
 /e2e/*.js
 /e2e/*.map

.nvmrc

@@ -1 +1 @@
-12.18.4
+14.16.0

CONTRIBUTING.md

@@ -169,10 +169,10 @@ Footer should contain a [closing reference to an issue](https://help.github.com/
 Samples: (even more [samples](https://github.com/nestjs/nest/commits/master))
 
 ```
-docs(changelog) update change log to beta.5
+docs(changelog): update change log to beta.5
 ```
 ```
-bugfix(@nestjs/core) need to depend on latest rxjs and zone.js
+fix(@nestjs/core): need to depend on latest rxjs and zone.js
 
 The version in our package.json gets copied to the one we publish, and users need the latest of these.
 ```
@@ -184,10 +184,11 @@ If the commit reverts a previous commit, it should begin with `revert: `, follow
 Must be one of the following:
 
 * **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
+* **chore**: Updating tasks etc; no production code change
 * **ci**: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
 * **docs**: Documentation only changes
-* **feature**: A new feature
-* **bugfix**: A bug fix
+* **feat**: A new feature
+* **fix**: A bug fix
 * **perf**: A code change that improves performance
 * **refactor**: A code change that neither fixes a bug nor adds a feature
 * **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)

LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017 Kamil Myśliwiec <http://kamilmysliwiec.com>
+Copyright (c) 2017-2022 Kamil Myśliwiec <http://kamilmysliwiec.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <a href="http://nestjs.com/" target="_blank"><img src="https://nestjs.com/img/logo_text.svg" width="320" alt="Nest Logo" /></a>
+  <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

angular.json

@@ -20,10 +20,15 @@
             "assets": [
               "src/assets",
               "src/favicon.ico",
+              "src/apple-touch-icon.png",
+              "src/apple-touch-icon-precomposed.png",
+              "src/browserconfig.xml",
+              "src/mstile-150x150.png",
               "src/_redirects"
             ],
             "styles": [
-              "src/styles.scss"
+              "src/styles.scss",
+              "src/assets/css/perfect-scrollbar.min.css"
             ]
           },
           "configurations": {
@@ -34,10 +39,16 @@
                   "maximumWarning": "6kb"
                 }
               ],
-              "optimization": true,
+              "optimization": {
+                "scripts": true,
+                "styles": {
+                  "minify": true,
+                  "inlineCritical": true
+                },
+                "fonts": true
+              },
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
@@ -82,8 +93,7 @@
               "src/styles.scss"
             ],
             "assets": [
-              "src/assets",
-              "src/favicon.ico"
+              "src/assets"
             ]
           }
         },
@@ -140,4 +150,4 @@
   "cli": {
     "analytics": false
   }
-}
+}