Skip to content

Commit e4ac5c2

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents a845d51 + 7c21aea commit e4ac5c2

File tree

6 files changed

+16
-6
lines changed

6 files changed

+16
-6
lines changed

Diff for: .eslintrc.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module.exports = {
22
parser: '@typescript-eslint/parser',
33
parserOptions: {
4+
project: 'tsconfig.json',
5+
tsconfigRootDir: __dirname,
46
sourceType: 'module',
57
},
68
plugins: [],

Diff for: README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo_text.svg" width="320" alt="Nest Logo" /></a>
2+
<a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="120" alt="Nest Logo" /></a>
33
</p>
44

55
[circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
@@ -15,9 +15,9 @@
1515
<a href="https://discord.gg/G7Qnnhy" target="_blank"><img src="https://img.shields.io/badge/discord-online-brightgreen.svg" alt="Discord"/></a>
1616
<a href="https://opencollective.com/nest#backer" target="_blank"><img src="https://opencollective.com/nest/backers/badge.svg" alt="Backers on Open Collective" /></a>
1717
<a href="https://opencollective.com/nest#sponsor" target="_blank"><img src="https://opencollective.com/nest/sponsors/badge.svg" alt="Sponsors on Open Collective" /></a>
18-
<a href="https://paypal.me/kamilmysliwiec" target="_blank"><img src="https://img.shields.io/badge/Donate-PayPal-ff3f59.svg"/></a>
18+
<a href="https://paypal.me/kamilmysliwiec" target="_blank"><img src="https://img.shields.io/badge/Donate-PayPal-ff3f59.svg" alt="Donate us"/></a>
1919
<a href="https://opencollective.com/nest#sponsor" target="_blank"><img src="https://img.shields.io/badge/Support%20us-Open%20Collective-41B883.svg" alt="Support us"></a>
20-
<a href="https://twitter.com/nestframework" target="_blank"><img src="https://img.shields.io/twitter/follow/nestframework.svg?style=social&label=Follow"></a>
20+
<a href="https://twitter.com/nestframework" target="_blank"><img src="https://img.shields.io/twitter/follow/nestframework.svg?style=social&label=Follow" alt="Follow us on Twitter"></a>
2121
</p>
2222
<!--[![Backers on Open Collective](https://opencollective.com/nest/backers/badge.svg)](https://opencollective.com/nest#backer)
2323
[![Sponsors on Open Collective](https://opencollective.com/nest/sponsors/badge.svg)](https://opencollective.com/nest#sponsor)-->

Diff for: nest-cli.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
{
2+
"$schema": "https://json.schemastore.org/nest-cli",
23
"collection": "@nestjs/schematics",
3-
"sourceRoot": "src"
4+
"sourceRoot": "src",
5+
"compilerOptions": {
6+
"deleteOutDir": true
7+
}
48
}

Diff for: test/app.e2e-spec.ts

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ describe('AppController (e2e)', () => {
1515
await app.init();
1616
});
1717

18+
afterAll(async () => {
19+
await app.close();
20+
});
21+
1822
it('/ (GET)', () => {
1923
return request(app.getHttpServer()).get('/').expect(404);
2024
});

Diff for: test/jest-e2e.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"moduleFileExtensions": ["js", "json", "ts"],
33
"rootDir": ".",
44
"testEnvironment": "node",
5-
"testRegex": ".e2e-spec.ts$",
5+
"testRegex": "\\.e2e-spec\\.ts$",
66
"transform": {
77
"^.+\\.(t|j)s$": "ts-jest"
88
}

Diff for: tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"emitDecoratorMetadata": true,
77
"experimentalDecorators": true,
88
"allowSyntheticDefaultImports": true,
9-
"target": "es2017",
9+
"target": "ES2021",
1010
"sourceMap": true,
1111
"outDir": "./dist",
1212
"baseUrl": "./",

0 commit comments

Comments
 (0)