Auto stash before merge of "master" and "origin/master"

nestjs · Feb 15, 2018 · 375028d · 375028d
1 parent 97c6ae4
commit 375028d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/lib/common/interfaces/nest-application-options.interface.d.ts b/lib/common/interfaces/nest-application-options.interface.d.ts
@@ -1,6 +1,7 @@
 import { HttpsOptions } from './https-options.interface';
 import { NestApplicationContextOptions } from './nest-application-context-options.interface';
-export interface NestApplicationOptions extends HttpsOptions, NestApplicationContextOptions {
+export interface NestApplicationOptions extends NestApplicationContextOptions {
     cors?: boolean;
     bodyParser?: boolean;
+    httpsOptions?: HttpsOptions;
 }
diff --git a/lib/core/nest-application.js b/lib/core/nest-application.js
@@ -62,8 +62,8 @@ class NestApplication extends nest_application_context_1.NestApplicationContext
         this.appOptions.cors && this.enableCors();
     }
     createServer() {
-        if (this.appOptions && this.appOptions.key) {
-            return https.createServer(this.appOptions, this.express);
+        if (this.appOptions && this.appOptions.httpsOptions) {
+            return https.createServer(this.appOptions.httpsOptions, this.express);
         }
         return http.createServer(this.express);
     }

diff --git a/lib/core/nest-factory.d.ts b/lib/core/nest-factory.d.ts
@@ -1,5 +1,5 @@
 import { NestApplicationOptions } from '@nestjs/common/interfaces/nest-application-options.interface';
-import { INestApplication, INestMicroservice, INestApplicationContext } from '@nestjs/common';
+import { INestMicroservice, INestApplicationContext } from '@nestjs/common';
 import { NestApplicationContextOptions } from '@nestjs/common/interfaces/nest-application-context-options.interface';
 import { NestMicroserviceOptions } from '@nestjs/common/interfaces/microservices/nest-microservice-options.interface';
 export declare class NestFactoryStatic {
@@ -8,7 +8,9 @@ export declare class NestFactoryStatic {
      * Creates an instance of the NestApplication (returns Promise)
      * @returns an `Promise` of the INestApplication instance
      */
-    create(module: any, expressOrOptions?: any | NestApplicationOptions, options?: NestApplicationOptions): Promise<INestApplication>;
+    create(module: any): any;
+    create(module: any, options: NestApplicationOptions): any;
+    create(module: any, express: any, options: NestApplicationOptions): any;
     /**
      * Creates an instance of the NestMicroservice (returns Promise)
      *

diff --git a/lib/core/nest-factory.js b/lib/core/nest-factory.js
@@ -27,10 +27,6 @@ class NestFactoryStatic {
     constructor() {
         this.logger = new logger_service_1.Logger('NestFactory', true);
     }
-    /**
-     * Creates an instance of the NestApplication (returns Promise)
-     * @returns an `Promise` of the INestApplication instance
-     */
     create(module, expressOrOptions, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const isExpressInstance = expressOrOptions && expressOrOptions.response;