Skip to content

[TypeScript][Angular] Remove rxjs operators #6989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 3 commits into from
Nov 24, 2017
Merged

[TypeScript][Angular] Remove rxjs operators #6989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adc6698
do not import rxjs-operators if using HttpClinet
topce Nov 17, 2017
3a08191
generate code
filipsl27 Nov 17, 2017
81a002b
do not import operators if they are not needed
filipsl27 Nov 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import { Response, ResponseContentType } from '@angular/http
{{/useHttpClient}}

import { Observable } from 'rxjs/Observable';
{{^useHttpClient}}
import '../rxjs-operators';
{{/useHttpClient}}

{{#imports}}
import { {{classname}} } from '../{{filename}}';
Expand Down
6 changes: 6 additions & 0 deletions modules/swagger-codegen/src/main/resources/typescript-angular/rxjs-operators.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
{{#useHttpClient}}
// RxJS imports are not needed for Angular 4.3 and later
{{/useHttpClient}}

{{^useHttpClient}}
// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs

// See node_module/rxjs/Rxjs.js
Expand All @@ -9,3 +14,4 @@ import 'rxjs/add/observable/throw';
// Operators
import 'rxjs/add/operator/catch';
import 'rxjs/add/operator/map';
{{/useHttpClient}}
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular-v2/default/git_push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ git_remote=`git remote`
if [ "$git_remote" = "" ]; then # git remote not defined

if [ "$GIT_TOKEN" = "" ]; then
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
else
git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/typescript-angular-v2/default/rxjs-operators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs

// See node_module/rxjs/Rxjs.js
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular-v2/npm/git_push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ git_remote=`git remote`
if [ "$git_remote" = "" ]; then # git remote not defined

if [ "$GIT_TOKEN" = "" ]; then
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
else
git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/typescript-angular-v2/npm/rxjs-operators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs

// See node_module/rxjs/Rxjs.js
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular-v2/with-interfaces/git_push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ git_remote=`git remote`
if [ "$git_remote" = "" ]; then # git remote not defined

if [ "$GIT_TOKEN" = "" ]; then
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
else
git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular-v2/with-interfaces/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@
"typescript": "^2.1.5"
},
"publishConfig": {
"registry":"https://skimdb.npmjs.com/registry"
"registry": "https://skimdb.npmjs.com/registry"
}
}
1 change: 1 addition & 0 deletions samples/client/petstore/typescript-angular-v2/with-interfaces/rxjs-operators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs

// See node_module/rxjs/Rxjs.js
Expand Down
1 change: 0 additions & 1 deletion samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { Inject, Injectable, Optional } from '@angular/core
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';

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

import { ApiResponse } from '../model/apiResponse';
import { Pet } from '../model/pet';
Expand Down
1 change: 0 additions & 1 deletion samples/client/petstore/typescript-angular-v4.3/npm/api/store.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { Inject, Injectable, Optional } from '@angular/core
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';

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

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

Expand Down
1 change: 0 additions & 1 deletion samples/client/petstore/typescript-angular-v4.3/npm/api/user.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { Inject, Injectable, Optional } from '@angular/core
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';

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

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

Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular-v4.3/npm/git_push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ git_remote=`git remote`
if [ "$git_remote" = "" ]; then # git remote not defined

if [ "$GIT_TOKEN" = "" ]; then
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
else
git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
Expand Down
11 changes: 1 addition & 10 deletions samples/client/petstore/typescript-angular-v4.3/npm/rxjs-operators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,2 @@
// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs
// RxJS imports are not needed for Angular 4.3 and later

// See node_module/rxjs/Rxjs.js
// Import just the rxjs statics and operators we need for THIS app.

// Statics
import 'rxjs/add/observable/throw';

// Operators
import 'rxjs/add/operator/catch';
import 'rxjs/add/operator/map';
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-angular-v4/npm/git_push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ git_remote=`git remote`
if [ "$git_remote" = "" ]; then # git remote not defined

if [ "$GIT_TOKEN" = "" ]; then
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git crediential in your environment."
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
else
git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
Expand Down
1 change: 1 addition & 0 deletions samples/client/petstore/typescript-angular-v4/npm/rxjs-operators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

// RxJS imports according to https://angular.io/docs/ts/latest/guide/server-communication.html#!#rxjs

// See node_module/rxjs/Rxjs.js
Expand Down