From 7ee578ff650e0b0488c98e7b37ac9f0eeade9efa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20My=C5=9Bliwiec?= <mail@kamilmysliwiec.com>
Date: Thu, 21 Dec 2017 14:30:12 +0100
Subject: [PATCH 1/3] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 36d569a..bbfad47 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 [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 web applications. </p>
+ <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/cqrs.svg" alt="NPM Version" /></a>
 <a href="https://www.npmjs.com/~nestjscore"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>

From 0d428ae40f8b1fe52fd05765c796a2a5e1f212d7 Mon Sep 17 00:00:00 2001
From: fanybook <fanybook@gmail.com>
Date: Fri, 29 Dec 2017 11:37:44 +0800
Subject: [PATCH 2/3] Update package.json

docs is 4.5 ?
---
 package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 139c499..2025939 100644
--- a/package.json
+++ b/package.json
@@ -10,11 +10,11 @@
     "start:prod": "node dist/server.js"
   },
   "dependencies": {
-    "@nestjs/common": "^4.4.0",
-    "@nestjs/core": "^4.4.0",
-    "@nestjs/microservices": "^4.4.0",
-    "@nestjs/testing": "^4.4.0",
-    "@nestjs/websockets": "^4.4.0",
+    "@nestjs/common": "^4.5.0",
+    "@nestjs/core": "^4.5.0",
+    "@nestjs/microservices": "^4.5.0",
+    "@nestjs/testing": "^4.5.0",
+    "@nestjs/websockets": "^4.5.0",
     "redis": "^2.7.1",
     "reflect-metadata": "^0.1.10",
     "rxjs": "^5.4.0",

From fbf61e5d76ee97ecb6724626233e6676dbed4484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20My=C5=9Bliwiec?= <mail@kamilmysliwiec.com>
Date: Tue, 2 Jan 2018 16:14:44 +0100
Subject: [PATCH 3/3] update(@nestjs) fit style guide

---
 index.js                            | 2 +-
 package.json                        | 2 +-
 src/{modules => }/app.controller.ts | 0
 src/{modules => }/app.module.ts     | 2 +-
 src/{server.ts => main.ts}          | 2 +-
 tslint.json                         | 1 +
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename src/{modules => }/app.controller.ts (100%)
 rename src/{modules => }/app.module.ts (92%)
 rename src/{server.ts => main.ts} (74%)

diff --git a/index.js b/index.js
index 81af91e..caba4e2 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,5 @@
 require('ts-node/register');
-require('./src/server');
+require('./src/main');
 
 
 
diff --git a/package.json b/package.json
index 139c499..3fa3f45 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "start": "node index.js",
     "start:watch": "nodemon",
     "prestart:prod": "tsc",
-    "start:prod": "node dist/server.js"
+    "start:prod": "node dist/main.js"
   },
   "dependencies": {
     "@nestjs/common": "^4.4.0",
diff --git a/src/modules/app.controller.ts b/src/app.controller.ts
similarity index 100%
rename from src/modules/app.controller.ts
rename to src/app.controller.ts
diff --git a/src/modules/app.module.ts b/src/app.module.ts
similarity index 92%
rename from src/modules/app.module.ts
rename to src/app.module.ts
index e30a8a6..fcfd5b5 100644
--- a/src/modules/app.module.ts
+++ b/src/app.module.ts
@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
 import { AppController } from './app.controller';
 
 @Module({
-  modules: [],
+  imports: [],
   controllers: [AppController],
   components: [],
 })
diff --git a/src/server.ts b/src/main.ts
similarity index 74%
rename from src/server.ts
rename to src/main.ts
index 59e8ad1..b7eeb82 100644
--- a/src/server.ts
+++ b/src/main.ts
@@ -1,5 +1,5 @@
 import { NestFactory } from '@nestjs/core';
-import { ApplicationModule } from './modules/app.module';
+import { ApplicationModule } from './app.module';
 
 async function bootstrap() {
 	const app = await NestFactory.create(ApplicationModule);
diff --git a/tslint.json b/tslint.json
index db3df4c..852257c 100644
--- a/tslint.json
+++ b/tslint.json
@@ -12,6 +12,7 @@
             true,
             "single"
         ],
+        "indent": false,
         "member-access": [
             false
         ],