Updated npm configuration to use new typescript2 typings system

This also removes the dependency to the typings project.
Issue #4761

modules/swagger-codegen/src/main/resources/typescript-angular2/README.mustache

@@ -28,9 +28,37 @@ _unPublished (not recommended):_
 npm install PATH_TO_GENERATED_PACKAGE --save
 ```
 
+_using `npm link`:_
+
+In PATH_TO_GENERATED_PACKAGE:
+```
+npm link
+```
+
+In your project:
+```
+npm link {{npmName}}@{{npmVersion}}
+```
+
 In your angular2 project:
 
-TODO: paste example.
+```
+import { DefaultApi } from '{{npmName}}/api/api';
+@NgModule({
+    imports: [],
+    declarations: [],
+    exports: [],
+    providers: [AppModule]
+})
+export class CoreModule {}
+```
+```
+import { DefaultApi } from '{{npmName}}/api/api';
+
+export class AppComponent {
+	 constructor(private apiGateway: DefaultApi) { }
+}
+```
 
 ### Set service base path
 If different than the generated base path, during app bootstrap, you can provide the base path to your service. 
@@ -42,3 +70,29 @@ bootstrap(AppComponent, [
     { provide: BASE_PATH, useValue: 'https://your-web-service.com' },
 ]);
 ```
+
+#### Using @angular/cli
+First extend your `src/environments/*.ts` files by adding the corresponding base path:
+
+```
+export const environment = {
+  production: false,
+  API_BASE_PATH: 'http://127.0.0.1:8080'
+};
+```
+
+In the src/app/app.module.ts:
+```
+import { BASE_PATH } from '{{npmName}}';
+import { environment } from '../environments/environment';
+
+@NgModule({
+  declarations: [
+    AppComponent,
+  ],
+  imports: [ ],
+  providers: [{ provide: BASE_PATH, useValue: useValue: environment.API_BASE_PATH }],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }
+```  

modules/swagger-codegen/src/main/resources/typescript-angular2/package.mustache

@@ -10,31 +10,29 @@
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "build": "typings install && tsc --outDir dist/",
+    "build": "tsc",
     "postinstall": "npm run build"
   },
   "peerDependencies": {
-    "@angular/core": "^2.0.0-rc.5",
+    "@angular/core": "^2.2.2",
-    "@angular/http": "^2.0.0-rc.5",
+    "@angular/http": "^2.2.2",
-    "@angular/common": "^2.0.0-rc.5",
+    "@angular/common": "^2.2.2",
-    "@angular/compiler": "^2.0.0-rc.5",
+    "@angular/compiler": "^2.2.2",
     "core-js": "^2.4.0",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "5.0.0-beta.6",
+    "rxjs": "^5.1.0",
-    "zone.js": "^0.6.17"
+    "zone.js": "^0.7.6"
   },
   "devDependencies": {
-    "@angular/core": "^2.0.0-rc.5",
+    "@angular/core": "^2.2.2",
-    "@angular/http": "^2.0.0-rc.5",
+    "@angular/http": "^2.2.2",
-    "@angular/common": "^2.0.0-rc.5",
+    "@angular/common": "^2.2.2",
-    "@angular/compiler": "^2.0.0-rc.5",
+    "@angular/compiler": "^2.2.2",
-    "@angular/platform-browser": "^2.0.0-rc.5",
+    "@angular/platform-browser": "^2.2.2",
-    "core-js": "^2.4.0",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "5.0.0-beta.6",
+    "rxjs": "5.1.0",
-    "zone.js": "^0.6.17",  
+    "zone.js": "^0.7.6",  
-    "typescript": "^1.8.10",
+    "typescript": "^2.1.5"
-    "typings": "^1.3.2"
   }{{#npmRepository}},{{/npmRepository}}
 {{#npmRepository}}
   "publishConfig":{

modules/swagger-codegen/src/main/resources/typescript-angular2/tsconfig.mustache

@@ -5,23 +5,21 @@
         "noImplicitAny": false,
         "suppressImplicitAnyIndexErrors": true,
         "target": "es5",
-        "module": "commonjs",
+        "module": "es6",
         "moduleResolution": "node",
         "removeComments": true,
         "sourceMap": true,
         "outDir": "./dist",
         "noLib": false,
-        "declaration": true
+        "declaration": true,
+        "lib": [ "es6", "dom" ]
     },
     "exclude": [
         "node_modules",
-        "typings/main.d.ts",
-        "typings/main",
         "dist"
     ],
     "filesGlob": [
         "./model/*.ts",
-        "./api/*.ts",
+        "./api/*.ts"
-        "typings/browser.d.ts"
     ]
 }

samples/client/petstore/typescript-angular2/npm/README.md

@@ -28,9 +28,37 @@ _unPublished (not recommended):_
 npm install PATH_TO_GENERATED_PACKAGE --save
 ```
 
+_using `npm link`:_
+
+In PATH_TO_GENERATED_PACKAGE:
+```
+npm link
+```
+
+In your project:
+```
+npm link @swagger/angular2-typescript-petstore@0.0.1
+```
+
 In your angular2 project:
 
-TODO: paste example.
+```
+import { DefaultApi } from '@swagger/angular2-typescript-petstore/api/api';
+@NgModule({
+    imports: [],
+    declarations: [],
+    exports: [],
+    providers: [AppModule]
+})
+export class CoreModule {}
+```
+```
+import { DefaultApi } from '@swagger/angular2-typescript-petstore/api/api';
+
+export class AppComponent {
+	 constructor(private apiGateway: DefaultApi) { }
+}
+```
 
 ### Set service base path
 If different than the generated base path, during app bootstrap, you can provide the base path to your service. 
@@ -42,3 +70,29 @@ bootstrap(AppComponent, [
     { provide: BASE_PATH, useValue: 'https://your-web-service.com' },
 ]);
 ```
+
+#### Using @angular/cli
+First extend your `src/environments/*.ts` files by adding the corresponding base path:
+
+```
+export const environment = {
+  production: false,
+  API_BASE_PATH: 'http://127.0.0.1:8080'
+};
+```
+
+In the src/app/app.module.ts:
+```
+import { BASE_PATH } from '@swagger/angular2-typescript-petstore';
+import { environment } from '../environments/environment';
+
+@NgModule({
+  declarations: [
+    AppComponent,
+  ],
+  imports: [ ],
+  providers: [{ provide: BASE_PATH, useValue: useValue: environment.API_BASE_PATH }],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }
+```  

samples/client/petstore/typescript-angular2/npm/package.json

@@ -10,31 +10,29 @@
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "build": "typings install && tsc --outDir dist/",
+    "build": "tsc",
     "postinstall": "npm run build"
   },
   "peerDependencies": {
-    "@angular/core": "^2.0.0-rc.5",
+    "@angular/core": "^2.2.2",
-    "@angular/http": "^2.0.0-rc.5",
+    "@angular/http": "^2.2.2",
-    "@angular/common": "^2.0.0-rc.5",
+    "@angular/common": "^2.2.2",
-    "@angular/compiler": "^2.0.0-rc.5",
+    "@angular/compiler": "^2.2.2",
     "core-js": "^2.4.0",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "5.0.0-beta.6",
+    "rxjs": "^5.1.0",
-    "zone.js": "^0.6.17"
+    "zone.js": "^0.7.6"
   },
   "devDependencies": {
-    "@angular/core": "^2.0.0-rc.5",
+    "@angular/core": "^2.2.2",
-    "@angular/http": "^2.0.0-rc.5",
+    "@angular/http": "^2.2.2",
-    "@angular/common": "^2.0.0-rc.5",
+    "@angular/common": "^2.2.2",
-    "@angular/compiler": "^2.0.0-rc.5",
+    "@angular/compiler": "^2.2.2",
-    "@angular/platform-browser": "^2.0.0-rc.5",
+    "@angular/platform-browser": "^2.2.2",
-    "core-js": "^2.4.0",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "5.0.0-beta.6",
+    "rxjs": "5.1.0",
-    "zone.js": "^0.6.17",  
+    "zone.js": "^0.7.6",  
-    "typescript": "^1.8.10",
+    "typescript": "^2.1.5"
-    "typings": "^1.3.2"
   },
   "publishConfig":{
     "registry":"https://skimdb.npmjs.com/registry"

samples/client/petstore/typescript-angular2/npm/tsconfig.json

@@ -5,23 +5,21 @@
         "noImplicitAny": false,
         "suppressImplicitAnyIndexErrors": true,
         "target": "es5",
-        "module": "commonjs",
+        "module": "es6",
         "moduleResolution": "node",
         "removeComments": true,
         "sourceMap": true,
         "outDir": "./dist",
         "noLib": false,
-        "declaration": true
+        "declaration": true,
+        "lib": [ "es6", "dom" ]
     },
     "exclude": [
         "node_modules",
-        "typings/main.d.ts",
-        "typings/main",
         "dist"
     ],
     "filesGlob": [
         "./model/*.ts",
-        "./api/*.ts",
+        "./api/*.ts"
-        "typings/browser.d.ts"
     ]
 }