Skip to content

build: remove @angular/http from modules #34892

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

Closed
CaerusKaru wants to merge 1 commit into from
Closed

build: remove @angular/http from modules #34892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion modules/playground/src/http/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ ng_module(
srcs = glob(["**/*.ts"]),
tsconfig = "//modules/playground:tsconfig-build.json",
deps = [
"//packages/common/http",
"//packages/core",
"//packages/http",
"//packages/platform-browser",
"//packages/platform-browser-dynamic",
"@npm//rxjs",
Expand Down
9 changes: 3 additions & 6 deletions modules/playground/src/http/app/http_comp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
* found in the LICENSE file at https://angular.io/license
*/

import {HttpClient} from '@angular/common/http';
import {Component} from '@angular/core';
import {Http, Response} from '@angular/http';
import {map} from 'rxjs/operators';

@Component({
selector: 'http-app',
Expand All @@ -23,9 +22,7 @@ import {map} from 'rxjs/operators';
})
export class HttpCmp {
people: Object[];
constructor(http: Http) {
http.get('./people.json')
.pipe(map((res: Response) => res.json()))
.subscribe((people: Array<Object>) => this.people = people);
constructor(http: HttpClient) {
http.get('./people.json').subscribe((people: Array<Object>) => this.people = people);
}
}
5 changes: 3 additions & 2 deletions modules/playground/src/http/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
* found in the LICENSE file at https://angular.io/license
*/

import {HttpClientModule} from '@angular/common/http';
import {NgModule} from '@angular/core';
import {HttpModule} from '@angular/http';
import {BrowserModule} from '@angular/platform-browser';
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';

import {HttpCmp} from './app/http_comp';

@NgModule({declarations: [HttpCmp], bootstrap: [HttpCmp], imports: [BrowserModule, HttpModule]})
@NgModule(
{declarations: [HttpCmp], bootstrap: [HttpCmp], imports: [BrowserModule, HttpClientModule]})
export class ExampleModule {
}

Expand Down
2 changes: 1 addition & 1 deletion modules/playground/src/jsonp/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ ng_module(
srcs = glob(["**/*.ts"]),
tsconfig = "//modules/playground:tsconfig-build.json",
deps = [
"//packages/common/http",
"//packages/core",
"//packages/http",
"//packages/platform-browser",
"//packages/platform-browser-dynamic",
],
Expand Down
6 changes: 3 additions & 3 deletions modules/playground/src/jsonp/app/jsonp_comp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* found in the LICENSE file at https://angular.io/license
*/

import {HttpClient} from '@angular/common/http';
import {Component} from '@angular/core';
import {Jsonp} from '@angular/http';

@Component({
selector: 'jsonp-app',
Expand All @@ -22,7 +22,7 @@ import {Jsonp} from '@angular/http';
})
export class JsonpCmp {
people: Object;
constructor(jsonp: Jsonp) {
jsonp.get('./people.json?callback=JSONP_CALLBACK').subscribe(res => this.people = res.json());
constructor(http: HttpClient) {
http.jsonp<Object>('./people.json', 'callback').subscribe((res: Object) => this.people = res);
}
}
8 changes: 6 additions & 2 deletions modules/playground/src/jsonp/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,18 @@
* found in the LICENSE file at https://angular.io/license
*/

import {HttpClientJsonpModule, HttpClientModule} from '@angular/common/http';
import {NgModule} from '@angular/core';
import {JsonpModule} from '@angular/http';
import {BrowserModule} from '@angular/platform-browser';
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';

import {JsonpCmp} from './app/jsonp_comp';

@NgModule({bootstrap: [JsonpCmp], declarations: [JsonpCmp], imports: [BrowserModule, JsonpModule]})
@NgModule({
bootstrap: [JsonpCmp],
declarations: [JsonpCmp],
imports: [BrowserModule, HttpClientModule, HttpClientJsonpModule]
})
export class ExampleModule {
}

Expand Down
2 changes: 1 addition & 1 deletion modules/playground/src/jsonp/people.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// This can only be requested once due to constant method name :(
__ng_jsonp__.__req0.finished([{"name":"caitp"}])
ng_jsonp_callback_0([{"name":"caitp"}])