Skip to content

Commit 8a0de97

Browse files
topcewing328
authored andcommitted
Remove rxjs operators (#6989)
* do not import rxjs-operators if using HttpClinet * generate code * do not import operators if they are not needed
1 parent 57b42a5 commit 8a0de97

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ import { CustomQueryEncoderHelper } from '../encoder';
1515
{{/useHttpClient}}
1616

1717
import { Observable } from 'rxjs/Observable';
18+
{{^useHttpClient}}
1819
import '../rxjs-operators';
20+
{{/useHttpClient}}
1921

2022
{{#imports}}
2123
import { {{classname}} } from '../{{filename}}';

modules/swagger-codegen/src/main/resources/typescript-angular/rxjs-operators.mustache

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
{{#useHttpClient}}
2+
// RxJS imports are not needed for Angular 4.3 and later
3+
{{/useHttpClient}}
4+
5+
{{^useHttpClient}}
16
// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs
27

38
// See node_module/rxjs/Rxjs.js
@@ -9,3 +14,4 @@ import 'rxjs/add/observable/throw';
914
// Operators
1015
import 'rxjs/add/operator/catch';
1116
import 'rxjs/add/operator/map';
17+
{{/useHttpClient}}

samples/client/petstore/typescript-angular-v2/default/rxjs-operators.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs
23

34
// See node_module/rxjs/Rxjs.js

samples/client/petstore/typescript-angular-v2/npm/rxjs-operators.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs
23

34
// See node_module/rxjs/Rxjs.js

samples/client/petstore/typescript-angular-v2/with-interfaces/rxjs-operators.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs
23

34
// See node_module/rxjs/Rxjs.js

samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import { HttpClient, HttpHeaders, HttpParams,
1717
import { CustomHttpUrlEncodingCodec } from '../encoder';
1818

1919
import { Observable } from 'rxjs/Observable';
20-
import '../rxjs-operators';
2120

2221
import { ApiResponse } from '../model/apiResponse';
2322
import { Pet } from '../model/pet';

samples/client/petstore/typescript-angular-v4.3/npm/api/store.service.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import { HttpClient, HttpHeaders, HttpParams,
1717
import { CustomHttpUrlEncodingCodec } from '../encoder';
1818

1919
import { Observable } from 'rxjs/Observable';
20-
import '../rxjs-operators';
2120

2221
import { Order } from '../model/order';
2322

samples/client/petstore/typescript-angular-v4.3/npm/api/user.service.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import { HttpClient, HttpHeaders, HttpParams,
1717
import { CustomHttpUrlEncodingCodec } from '../encoder';
1818

1919
import { Observable } from 'rxjs/Observable';
20-
import '../rxjs-operators';
2120

2221
import { User } from '../model/user';
2322

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,2 @@
1-
// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs
1+
// RxJS imports are not needed for Angular 4.3 and later
22

3-
// See node_module/rxjs/Rxjs.js
4-
// Import just the rxjs statics and operators we need for THIS app.
5-
6-
// Statics
7-
import 'rxjs/add/observable/throw';
8-
9-
// Operators
10-
import 'rxjs/add/operator/catch';
11-
import 'rxjs/add/operator/map';

samples/client/petstore/typescript-angular-v4/npm/rxjs-operators.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs
23

34
// See node_module/rxjs/Rxjs.js

0 commit comments

Comments
 (0)