Merge pull request #6 from hapinessjs/next

release(version): v5.1.2

Makefile

@@ -6,9 +6,11 @@ coveralls:
 	cat ./coverage/lcov.info | node ./node_modules/.bin/coveralls
 tsc:
 	@node ./node_modules/.bin/tsc -p ./tsconfig.build.json
+ngc-tokens:
+	@node ./node_modules/.bin/ngc -p ./tsconfig.build.tokens.json
 clean:
 	@node ./node_modules/.bin/rimraf ./dist
 packaging:
 	@node ./node_modules/.bin/ts-node ./tools/packaging.ts
 
-.PHONY: pretest test test-on-travis tsc clean packaging
+.PHONY: pretest test coveralls tsc ngc-tokens clean packaging

README.md

@@ -45,7 +45,7 @@ This is a [Hapiness](https://github.com/hapinessjs/hapiness) Engine for running
 
 This story will show you how to set up Universal bundling for an existing `@angular/cli`.
 
-We support actually `@angular` `@5.0.4` and next so you must upgrade all packages inside your project.
+We support actually `@angular` `@5.0.5` and next so you must upgrade all packages inside your project.
 
 We use `yarn` as package manager.
 
@@ -550,6 +550,10 @@ To set up your development environment:
 [Back to top](#table-of-contents)
 
 ## Change History
+* v5.1.2 (2017-12-05)
+    * `Angular v5.0.5+`
+    * `RxJS v5.5.3+`
+    * Fix compilation of `Angular InjectionToken` instances for `Request` and `Response` objects
 * v5.1.1 (2017-12-01)
     * `Angular v5.0.4+`
     * Change signature of `universal service response` related to latest `@hapiness/core`

package.json

@@ -1,8 +1,8 @@
 {
     "name": "@hapiness/ng-universal",
-    "version": "5.1.1",
+    "version": "5.1.2",
     "description": "This is a Hapiness Engine for running Angular Apps on the server for server side rendering.",
-    "main": "commonjs/index.js",
+    "main": "index.js",
     "types": "index.d.ts",
     "private": false,
     "scripts": {
@@ -11,7 +11,7 @@
         "coveralls": "make coveralls",
         "packaging": "make packaging",
         "prebuild": "make pretest && make test && make clean",
-        "build": "make tsc",
+        "build": "make tsc && make ngc-tokens",
         "postbuild": "make packaging"
     },
     "repository": {
@@ -71,17 +71,18 @@
     },
     "homepage": "https://github.com/hapinessjs/ng-universal-module#readme",
     "dependencies": {
-        "@types/node": "^8.0.53"
+        "@types/node": "^8.0.54"
     },
     "devDependencies": {
-        "@angular/animations": "^5.0.4",
-        "@angular/common": "^5.0.4",
-        "@angular/compiler": "^5.0.4",
-        "@angular/core": "^5.0.4",
-        "@angular/http": "^5.0.4",
-        "@angular/platform-browser": "^5.0.4",
-        "@angular/platform-browser-dynamic": "^5.0.4",
-        "@angular/platform-server": "^5.0.4",
+        "@angular/animations": "^5.0.5",
+        "@angular/common": "^5.0.5",
+        "@angular/compiler": "^5.0.5",
+        "@angular/compiler-cli": "^5.0.5",
+        "@angular/core": "^5.0.5",
+        "@angular/http": "^5.0.5",
+        "@angular/platform-browser": "^5.0.5",
+        "@angular/platform-browser-dynamic": "^5.0.5",
+        "@angular/platform-server": "^5.0.5",
         "@hapiness/core": "^1.3.0",
         "@nguniversal/module-map-ngfactory-loader": "^5.0.0-beta.5",
         "@types/fs-extra": "^4.0.5",
@@ -91,23 +92,24 @@
         "mocha": "^4.0.1",
         "mocha-typescript": "^1.1.12",
         "rimraf": "^2.6.2",
-        "rxjs": "^5.5.2",
+        "rxjs": "^5.5.3",
         "ts-node": "^3.3.0",
         "tslint": "^5.8.0",
-        "typescript": "^2.6.1",
+        "typescript": "^2.6.2",
         "unit.js": "^2.0.0",
         "zone.js": "^0.8.18"
     },
     "peerDependencies": {
-        "@angular/compiler": "^5.0.4",
-        "@angular/core": "^5.0.4",
-        "@angular/http": "^5.0.4",
-        "@angular/platform-server": "^5.0.4",
+        "@angular/compiler": "^5.0.5",
+        "@angular/compiler-cli": "^5.0.5",
+        "@angular/core": "^5.0.5",
+        "@angular/http": "^5.0.5",
+        "@angular/platform-server": "^5.0.5",
         "@hapiness/core": "^1.3.0",
         "@hapiness/ng-universal-transfer-http": "^5.1.1",
         "@nguniversal/module-map-ngfactory-loader": "^5.0.0-beta.5",
-        "rxjs": "^5.5.2",
-        "ts-loader": "^3.1.1"
+        "rxjs": "^5.5.3",
+        "ts-loader": "^3.2.0"
     },
     "engines": {
         "node": ">=7.0.0"

src/index.ts

@@ -1 +1,3 @@
 export * from './module';
+export * from './injection';
+

src/injection/index.ts

@@ -0,0 +1,3 @@
+export * from './tokens';
+export { Request } from '@hapiness/core';
+export { Response } from 'hapi';

src/module/index.ts

@@ -1,4 +1,2 @@
 export * from './ng-universal.module';
-export { NgSetupOptions, StaticContent, REQUEST, RESPONSE } from './interfaces';
-export { Request } from '@hapiness/core';
-export { Response } from 'hapi';
+export { NgSetupOptions, StaticContent } from './interfaces';

src/module/interfaces/index.ts

@@ -1,3 +1,2 @@
-export * from './tokens';
 export * from './options';
 export * from './config';

src/module/services/engine/ng.service.ts

@@ -14,7 +14,8 @@ import { _throw } from 'rxjs/observable/throw';
 import * as fs from 'fs';
 import { join } from 'path';
 
-import { NG_UNIVERSAL_MODULE_CONFIG, REQUEST, RESPONSE, NgSetupOptions, StaticContent } from '../../interfaces';
+import { NG_UNIVERSAL_MODULE_CONFIG, NgSetupOptions, StaticContent } from '../../interfaces';
+import { REQUEST, RESPONSE } from '../../../injection';
 
 @Injectable()
 export class NgEngineService {

tsconfig.build.index.json

@@ -0,0 +1,18 @@
+{
+  "extends": "./tsconfig.build.json",
+  "compilerOptions": {
+    "outDir": "./dist/",
+    "rootDir": "./src/"
+  },
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
+  "exclude": [
+    "node_modules",
+    "dist",
+    "test",
+    "tools",
+    "src/injection",
+    "src/module"
+  ]
+}

tsconfig.build.json

@@ -1,9 +1,8 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "./dist/commonjs",
+    "outDir": "./dist",
     "rootDir": "./src",
-    "declarationDir": "./dist",
     "types": [
       "node"
     ]
@@ -12,6 +11,7 @@
     "node_modules",
     "dist",
     "test",
-    "tools"
+    "tools",
+    "src/injection"
   ]
 }

tsconfig.build.tokens.json

@@ -0,0 +1,18 @@
+{
+  "extends": "./tsconfig.build.json",
+  "compilerOptions": {
+    "outDir": "./dist/injection",
+    "rootDir": "./src/injection"
+  },
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true
+  },
+  "exclude": [
+    "node_modules",
+    "dist",
+    "test",
+    "tools",
+    "src/index.ts",
+    "src/module"
+  ]
+}