Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-18 20:02:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(@schematics/angular): remove @angular/http as it's deprecated

Browse Source
This commit is contained in:
Suguru Inatomi 2018-09-28 09:31:56 +09:00 committed by Alex Eagle
parent 3ae3fa3a1d
commit 1a6b471c82
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/schematics/angular/workspace/files/package.json
View File

@ -16,7 +16,6 @@
"@angular/compiler": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>", "@angular/compiler": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
"@angular/core": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>", "@angular/core": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
"@angular/forms": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>", "@angular/forms": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
"@angular/http": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
"@angular/platform-browser": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>", "@angular/platform-browser": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
"@angular/platform-browser-dynamic": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>", "@angular/platform-browser-dynamic": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
"@angular/router": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>", "@angular/router": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",

4
tests/legacy-cli/e2e/tests/basic/rebuild.ts
View File

@ -34,7 +34,7 @@ export default function() {
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { HttpModule } from '@angular/http'; import { HttpClientModule } from '@angular/common/http';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
@ -46,7 +46,7 @@ export default function() {
imports: [ imports: [
BrowserModule, BrowserModule,
FormsModule, FormsModule,
HttpModule, HttpClientModule,
RouterModule.forRoot([ RouterModule.forRoot([
{ path: 'lazy', loadChildren: './lazy/lazy.module#LazyModule' } { path: 'lazy', loadChildren: './lazy/lazy.module#LazyModule' }
]) ])

4
tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
View File

@ -18,9 +18,11 @@ export default function () {
} }
let platformServerVersion = readNgVersion(); let platformServerVersion = readNgVersion();
let httpVersion = readNgVersion();
if (getGlobalVariable('argv')['ng-snapshots']) { if (getGlobalVariable('argv')['ng-snapshots']) {
platformServerVersion = 'github:angular/platform-server-builds'; platformServerVersion = 'github:angular/platform-server-builds';
httpVersion = 'github:angular/http-builds';
} }
@ -33,6 +35,8 @@ export default function () {
.then(() => updateJsonFile('package.json', packageJson => { .then(() => updateJsonFile('package.json', packageJson => {
const dependencies = packageJson['dependencies']; const dependencies = packageJson['dependencies'];
dependencies['@angular/platform-server'] = platformServerVersion; dependencies['@angular/platform-server'] = platformServerVersion;
// ServerModule depends on @angular/http regardless the app's dependency.
dependencies['@angular/http'] = httpVersion;
}) })
.then(() => npm('install')) .then(() => npm('install'))
.then(() => ng('build', '--optimization')) .then(() => ng('build', '--optimization'))

4
tests/legacy-cli/e2e/tests/build/build-app-shell.ts
View File

@ -19,9 +19,11 @@ export default function () {
} }
let platformServerVersion = readNgVersion(); let platformServerVersion = readNgVersion();
let httpVersion = readNgVersion();
if (getGlobalVariable('argv')['ng-snapshots']) { if (getGlobalVariable('argv')['ng-snapshots']) {
platformServerVersion = 'github:angular/platform-server-builds'; platformServerVersion = 'github:angular/platform-server-builds';
httpVersion = 'github:angular/http-builds';
} }
return Promise.resolve() return Promise.resolve()
@ -134,6 +136,8 @@ export default function () {
.then(() => updateJsonFile('package.json', packageJson => { .then(() => updateJsonFile('package.json', packageJson => {
const dependencies = packageJson['dependencies']; const dependencies = packageJson['dependencies'];
dependencies['@angular/platform-server'] = platformServerVersion; dependencies['@angular/platform-server'] = platformServerVersion;
// ServerModule depends on @angular/http regardless the app's dependency.
dependencies['@angular/http'] = httpVersion;
}) })
.then(() => npm('install'))) .then(() => npm('install')))
.then(() => ng('run', 'test-project:app-shell')) .then(() => ng('run', 'test-project:app-shell'))

4
tests/legacy-cli/e2e/tests/build/platform-server.ts
View File

@ -20,9 +20,11 @@ export default function () {
} }
let platformServerVersion = readNgVersion(); let platformServerVersion = readNgVersion();
let httpVersion = readNgVersion();
if (getGlobalVariable('argv')['ng-snapshots']) { if (getGlobalVariable('argv')['ng-snapshots']) {
platformServerVersion = 'github:angular/platform-server-builds'; platformServerVersion = 'github:angular/platform-server-builds';
httpVersion = 'github:angular/http-builds';
} }
// Skip this test in Angular 2/4. // Skip this test in Angular 2/4.
@ -34,6 +36,8 @@ export default function () {
.then(() => updateJsonFile('package.json', packageJson => { .then(() => updateJsonFile('package.json', packageJson => {
const dependencies = packageJson['dependencies']; const dependencies = packageJson['dependencies'];
dependencies['@angular/platform-server'] = platformServerVersion; dependencies['@angular/platform-server'] = platformServerVersion;
// ServerModule depends on @angular/http regardless the app's dependency.
dependencies['@angular/http'] = httpVersion;
})) }))
.then(() => updateJsonFile('angular.json', workspaceJson => { .then(() => updateJsonFile('angular.json', workspaceJson => {
const appArchitect = workspaceJson.projects['test-project'].architect; const appArchitect = workspaceJson.projects['test-project'].architect;