@modern-js/server 1.2.1-beta.0 → 1.2.1-beta.1

package/dist/js/modern/libs/hook-api/template.js

@@ -23,28 +23,28 @@ class TemplateAPI {
     this.content = content;
   }
 
-  beforeHead(fragment) {
+  prependHead(fragment) {
     const {
       head
     } = RegList.before;
     return this.replace(head, `${head}${fragment}`);
   }
 
-  afterHead(fragment) {
+  appendHead(fragment) {
     const {
       head
     } = RegList.after;
     return this.replace(head, `${fragment}${head}`);
   }
 
-  beforeBody(fragment) {
+  prependBody(fragment) {
     const {
       body
     } = RegList.before;
     return this.replace(body, `${body}${fragment}`);
   }
 
-  afterBody(fragment) {
+  appendBody(fragment) {
     const {
       body
     } = RegList.after;

package/dist/js/modern/server/index.js

@@ -52,8 +52,8 @@ export class Server {
     return this;
   }
 
-  listen(port = 8080, listener) {
-    this.app.listen(port, () => {
+  listen(port, listener) {
+    this.app.listen(port || process.env.PORT, () => {
       if (listener) {
         listener();
       }

package/dist/js/modern/server/modern-server.js

@@ -177,6 +177,7 @@ export class ModernServer {
 
     return [];
   } // add promisify request handler to server
+  // handler should do not do more things after invoke next
 
 
   addHandler(handler) {
@@ -479,7 +480,7 @@ export class ModernServer {
       const injection = JSON.stringify(_objectSpread(_objectSpread({}, manifest), {}, {
         modules
       }));
-      templateAPI.afterHead(`<script>window.modern_manifest=${injection}</script>`);
+      templateAPI.appendHead(`<script>window.modern_manifest=${injection}</script>`);
     } catch (e) {
       context.error(ERROR_DIGEST.EMICROINJ, e);
     }

package/dist/js/node/libs/hook-api/template.js

@@ -29,28 +29,28 @@ class TemplateAPI {
     this.content = content;
   }
 
-  beforeHead(fragment) {
+  prependHead(fragment) {
     const {
       head
     } = RegList.before;
     return this.replace(head, `${head}${fragment}`);
   }
 
-  afterHead(fragment) {
+  appendHead(fragment) {
     const {
       head
     } = RegList.after;
     return this.replace(head, `${fragment}${head}`);
   }
 
-  beforeBody(fragment) {
+  prependBody(fragment) {
     const {
       body
     } = RegList.before;
     return this.replace(body, `${body}${fragment}`);
   }
 
-  afterBody(fragment) {
+  appendBody(fragment) {
     const {
       body
     } = RegList.after;

package/dist/js/node/server/index.js

@@ -68,8 +68,8 @@ class Server {
     return this;
   }
 
-  listen(port = 8080, listener) {
-    this.app.listen(port, () => {
+  listen(port, listener) {
+    this.app.listen(port || process.env.PORT, () => {
       if (listener) {
         listener();
       }

package/dist/js/node/server/modern-server.js

@@ -208,6 +208,7 @@ class ModernServer {
 
     return [];
   } // add promisify request handler to server
+  // handler should do not do more things after invoke next
 
 
   addHandler(handler) {
@@ -514,7 +515,7 @@ class ModernServer {
       const injection = JSON.stringify(_objectSpread(_objectSpread({}, manifest), {}, {
         modules
       }));
-      templateAPI.afterHead(`<script>window.modern_manifest=${injection}</script>`);
+      templateAPI.appendHead(`<script>window.modern_manifest=${injection}</script>`);
     } catch (e) {
       context.error(_constants.ERROR_DIGEST.EMICROINJ, e);
     }

package/dist/types/libs/hook-api/template.d.ts

@@ -3,10 +3,10 @@ declare class TemplateAPI {
   constructor(content: string);
   get(): string;
   set(content: string): void;
-  beforeHead(fragment: string): this;
-  afterHead(fragment: string): this;
-  beforeBody(fragment: string): this;
-  afterBody(fragment: string): this;
+  prependHead(fragment: string): this;
+  appendHead(fragment: string): this;
+  prependBody(fragment: string): this;
+  appendBody(fragment: string): this;
   replace(reg: RegExp | string, text: string): this;
 }
 

package/dist/types/server/index.d.ts

@@ -10,7 +10,7 @@ export declare class Server {
   getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: (() => void) | undefined) => void;
   ready(readyOptions?: ReadyOptions): void;
   init(): Promise<this>;
-  listen(port: number | undefined, listener: any): void;
+  listen(port: number, listener: any): void;
   listener(app: httpServer): void;
   close(): Promise<void>;
   private createProdServer;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.1-beta.0",
+  "version": "1.2.1-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",

package/src/libs/hook-api/template.ts

@@ -24,22 +24,22 @@ class TemplateAPI {
     this.content = content;
   }
 
-  public beforeHead(fragment: string) {
+  public prependHead(fragment: string) {
     const { head } = RegList.before;
     return this.replace(head, `${head}${fragment}`);
   }
 
-  public afterHead(fragment: string) {
+  public appendHead(fragment: string) {
     const { head } = RegList.after;
     return this.replace(head, `${fragment}${head}`);
   }
 
-  public beforeBody(fragment: string) {
+  public prependBody(fragment: string) {
     const { body } = RegList.before;
     return this.replace(body, `${body}${fragment}`);
   }
 
-  public afterBody(fragment: string) {
+  public appendBody(fragment: string) {
     const { body } = RegList.after;
     return this.replace(body, `${fragment}${body}`);
   }

package/src/server/index.ts

@@ -67,8 +67,8 @@ export class Server {
     return this;
   }
 
-  public listen(port = 8080, listener: any) {
-    this.app.listen(port, () => {
+  public listen(port: number, listener: any) {
+    this.app.listen(port || process.env.PORT, () => {
       if (listener) {
         listener();
       }

package/src/server/modern-server.ts

@@ -229,6 +229,7 @@ export class ModernServer {
   }
 
   // add promisify request handler to server
+  // handler should do not do more things after invoke next
   protected addHandler(handler: ModernServerHandler) {
     if ((handler as any)[Symbol.toStringTag] === 'AsyncFunction') {
       this.handlers.push(handler as ModernServerAsyncHandler);
@@ -502,7 +503,7 @@ export class ModernServer {
     try {
       // Todo Safety xss
       const injection = JSON.stringify({ ...manifest, modules });
-      templateAPI.afterHead(
+      templateAPI.appendHead(
         `<script>window.modern_manifest=${injection}</script>`,
       );
     } catch (e) {

package/tests/hook.test.ts

@@ -27,10 +27,10 @@ describe('test hook api', () => {
     templateAPI.replace('mock', 'replace');
     expect(templateAPI.get()).toMatch('replace');
 
-    templateAPI.afterBody('after body');
-    templateAPI.beforeBody('before body');
-    templateAPI.afterHead('after head');
-    templateAPI.beforeHead('before head');
+    templateAPI.appendBody('after body');
+    templateAPI.prependBody('before body');
+    templateAPI.appendHead('after head');
+    templateAPI.prependHead('before head');
 
     const newContent = templateAPI.get();
     expect(newContent).toMatch('<head>before head');