Skip to content

Commit 902a4f8

Browse files
committed
fix: @types/jasmine vs @types/jest conflict
1 parent be183de commit 902a4f8

File tree

3 files changed

+8
-52
lines changed

3 files changed

+8
-52
lines changed

apps/api/README.md

+4-41
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,9 @@
1-
<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>
3-
</p>
4-
5-
[travis-image]: https://api.travis-ci.org/nestjs/nest.svg?branch=master
6-
[travis-url]: https://travis-ci.org/nestjs/nest
7-
[linux-image]: https://img.shields.io/travis/nestjs/nest/master.svg?label=linux
8-
[linux-url]: https://travis-ci.org/nestjs/nest
9-
10-
<p align="center">A progressive <a href="http://nodejs.org" target="blank">Node.js</a> framework for building efficient and scalable server-side applications, heavily inspired by <a href="https://angular.io" target="blank">Angular</a>.</p>
11-
<p align="center">
12-
<a href="https://www.npmjs.com/~nestjscore"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>
13-
<a href="https://www.npmjs.com/~nestjscore"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>
14-
<a href="https://www.npmjs.com/~nestjscore"><img src="https://img.shields.io/npm/dm/@nestjs/core.svg" alt="NPM Downloads" /></a>
15-
<a href="https://travis-ci.org/nestjs/nest"><img src="https://api.travis-ci.org/nestjs/nest.svg?branch=master" alt="Travis" /></a>
16-
<a href="https://travis-ci.org/nestjs/nest"><img src="https://img.shields.io/travis/nestjs/nest/master.svg?label=linux" alt="Linux" /></a>
17-
<a href="https://coveralls.io/github/nestjs/nest?branch=master"><img src="https://coveralls.io/repos/github/nestjs/nest/badge.svg?branch=master#5" alt="Coverage" /></a>
18-
<a href="https://gitter.im/nestjs/nestjs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=body_badge"><img src="https://badges.gitter.im/nestjs/nestjs.svg" alt="Gitter" /></a>
19-
<a href="https://opencollective.com/nest#backer"><img src="https://opencollective.com/nest/backers/badge.svg" alt="Backers on Open Collective" /></a>
20-
<a href="https://opencollective.com/nest#sponsor"><img src="https://opencollective.com/nest/sponsors/badge.svg" alt="Sponsors on Open Collective" /></a>
21-
<a href="https://paypal.me/kamilmysliwiec"><img src="https://img.shields.io/badge/Donate-PayPal-dc3d53.svg"/></a>
22-
<a href="https://twitter.com/nestframework"><img src="https://img.shields.io/twitter/follow/nestframework.svg?style=social&label=Follow"></a>
23-
</p>
24-
<!--[![Backers on Open Collective](https://opencollective.com/nest/backers/badge.svg)](https://opencollective.com/nest#backer)
25-
[![Sponsors on Open Collective](https://opencollective.com/nest/sponsors/badge.svg)](https://opencollective.com/nest#sponsor)-->
1+
API
2+
===
263

274
## Description
285

29-
[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
6+
Backend API build with [Nest](https://github.com/nestjs/nest) framework``.
307

318

329
## Run
@@ -49,7 +26,7 @@ npm run api:start:prod
4926

5027
## Build
5128
```bash
52-
# production mode build (work-in-progress)
29+
# build for production env
5330
npm run api:prestart:prod
5431
```
5532

@@ -72,17 +49,3 @@ npm run api:test:cov
7249
# for api project
7350
npx jest --projects=apps/api --coverage
7451
```
75-
76-
## Support
77-
78-
Nest is an MIT-licensed open source project. It can grow thanks to the sponsors and support by the amazing backers. If you'd like to join them, please [read more here](https://docs.nestjs.com/support).
79-
80-
## Stay in touch
81-
82-
- Author - [Kamil Myśliwiec](https://kamilmysliwiec.com)
83-
- Website - [https://nestjs.com](https://nestjs.com/)
84-
- Twitter - [@nestframework](https://twitter.com/nestframework)
85-
86-
## License
87-
88-
Nest is [MIT licensed](LICENSE).

package-lock.json

+3-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@
116116
"@types/hammerjs": "^2.0.35",
117117
"@types/jasmine": "^2.8.8",
118118
"@types/jasminewd2": "^2.0.3",
119-
"@types/jest": "^23.1.0",
120-
"@types/node": "10.1.4",
119+
"@types/node": "^10.3.3",
121120
"@types/socket.io-client": "^1.4.32",
122121
"@types/supertest": "^2.0.4",
123122
"angular-cli-ghpages": "^0.5.2",

0 commit comments

Comments
 (0)