Skip to content
This repository was archived by the owner on Jul 12, 2019. It is now read-only.

Commit 6ccbab1

Browse files
vadjsvadjs
committed
Update for Angular 6
1 parent 101f6e1 commit 6ccbab1

File tree

7 files changed

+206
-137
lines changed

7 files changed

+206
-137
lines changed

‎.angular-cli.json

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎angular.json

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"universal-demo": {
7+
"root": "",
8+
"sourceRoot": "src",
9+
"projectType": "application",
10+
"architect": {
11+
"build": {
12+
"builder": "@angular-devkit/build-angular:browser",
13+
"options": {
14+
"outputPath": "dist",
15+
"index": "src/index.html",
16+
"main": "src/main.browser.ts",
17+
"tsConfig": "src/tsconfig.app.json",
18+
"polyfills": "src/polyfills.ts",
19+
"assets": [
20+
"src/assets",
21+
"src/favicon.ico",
22+
"src/robots.txt",
23+
"src/manifest.json"
24+
],
25+
"styles": [
26+
"src/styles.scss",
27+
"src/styles/main.scss"
28+
],
29+
"scripts": []
30+
},
31+
"configurations": {
32+
"dev": {
33+
"fileReplacements": [
34+
{
35+
"replace": "src/environments/environment.ts",
36+
"with": "src/environments/browser/environment.ts"
37+
}
38+
]
39+
},
40+
"production": {
41+
"optimization": true,
42+
"outputHashing": "all",
43+
"sourceMap": false,
44+
"extractCss": true,
45+
"namedChunks": false,
46+
"aot": true,
47+
"extractLicenses": true,
48+
"vendorChunk": false,
49+
"buildOptimizer": true,
50+
"fileReplacements": [
51+
{
52+
"replace": "src/environments/environment.ts",
53+
"with": "src/environments/browser/environment.prod.ts"
54+
}
55+
]
56+
}
57+
}
58+
},
59+
"serve": {
60+
"builder": "@angular-devkit/build-angular:dev-server",
61+
"options": {
62+
"browserTarget": "universal-demo:build"
63+
},
64+
"configurations": {
65+
"dev": {
66+
"browserTarget": "universal-demo:build:dev"
67+
},
68+
"production": {
69+
"browserTarget": "universal-demo:build:production"
70+
}
71+
}
72+
},
73+
"extract-i18n": {
74+
"builder": "@angular-devkit/build-angular:extract-i18n",
75+
"options": {
76+
"browserTarget": "universal-demo:build"
77+
}
78+
},
79+
"test": {
80+
"builder": "@angular-devkit/build-angular:karma",
81+
"options": {
82+
"main": "src/test.ts",
83+
"karmaConfig": "./karma.conf.js",
84+
"polyfills": "src/polyfills.ts",
85+
"tsConfig": "src/tsconfig.spec.json",
86+
"scripts": [],
87+
"styles": [
88+
"src/styles.scss",
89+
"src/styles/main.scss"
90+
],
91+
"assets": [
92+
"src/assets",
93+
"src/favicon.ico",
94+
"src/robots.txt",
95+
"src/manifest.json"
96+
]
97+
}
98+
},
99+
"lint": {
100+
"builder": "@angular-devkit/build-angular:tslint",
101+
"options": {
102+
"tsConfig": [
103+
"src/tsconfig.app.json",
104+
"src/tsconfig.spec.json"
105+
],
106+
"exclude": [
107+
"**/node_modules/**"
108+
]
109+
}
110+
},
111+
"server": {
112+
"builder": "@angular-devkit/build-angular:server",
113+
"options": {
114+
"outputPath": "dist-server",
115+
"main": "main.server.ts",
116+
"tsConfig": "tsconfig.server.json"
117+
}
118+
}
119+
}
120+
},
121+
"universal-demo-e2e": {
122+
"root": "",
123+
"sourceRoot": "",
124+
"projectType": "application",
125+
"architect": {
126+
"e2e": {
127+
"builder": "@angular-devkit/build-angular:protractor",
128+
"options": {
129+
"protractorConfig": "./protractor.conf.js",
130+
"devServerTarget": "universal-demo:serve"
131+
}
132+
},
133+
"lint": {
134+
"builder": "@angular-devkit/build-angular:tslint",
135+
"options": {
136+
"tsConfig": [
137+
"e2e/tsconfig.e2e.json"
138+
],
139+
"exclude": [
140+
"**/node_modules/**"
141+
]
142+
}
143+
}
144+
}
145+
}
146+
},
147+
"defaultProject": "universal-demo",
148+
"schematics": {
149+
"@schematics/angular:component": {
150+
"prefix": "app",
151+
"styleext": "scss"
152+
},
153+
"@schematics/angular:directive": {
154+
"prefix": "app"
155+
}
156+
}
157+
}

‎karma.conf.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: '',
7-
frameworks: ['jasmine', '@angular/cli'],
7+
frameworks: ['jasmine', '@angular-devkit/build-angular'],
88
plugins: [
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-coverage-istanbul-reporter'),
13-
require('@angular/cli/plugins/karma')
13+
require('@angular-devkit/build-angular/plugins/karma')
1414
],
1515
client:{
1616
clearContext: false // leave Jasmine Spec Runner output visible in browser
1717
},
1818
coverageIstanbulReporter: {
19-
reports: [ 'html', 'lcovonly' ],
19+
dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
2020
fixWebpackSourcePaths: true
2121
},
2222
angularCli: {

‎lib/ngx-transfer-http/src/transfer-http.service.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { Injectable, Inject, PLATFORM_ID } from '@angular/core';
22
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
33
import { TransferState } from '@angular/platform-browser';
4-
import { Observable } from 'rxjs';
4+
import { Observable, from } from 'rxjs';
55
import { tap } from 'rxjs/operators';
6-
import { fromPromise } from 'rxjs/observable/fromPromise';
76
import { isPlatformBrowser, isPlatformServer } from '@angular/common';
87

98
@Injectable()
@@ -258,7 +257,7 @@ export class TransferHttpService {
258257
// Server only code.
259258
}
260259

261-
return fromPromise(Promise.resolve(data));
260+
return from(Promise.resolve(data));
262261
}
263262

264263
private setCache(key, data): any {

‎package.json

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -27,52 +27,53 @@
2727
},
2828
"private": false,
2929
"dependencies": {
30-
"@angular/animations": "5.2.9",
31-
"@angular/common": "5.2.9",
32-
"@angular/compiler": "5.2.9",
33-
"@angular/core": "5.2.9",
34-
"@angular/forms": "5.2.9",
35-
"@angular/http": "5.2.9",
36-
"@angular/platform-browser": "5.2.9",
37-
"@angular/platform-browser-dynamic": "5.2.9",
38-
"@angular/router": "5.2.9",
39-
"@angular/service-worker": "5.2.9",
40-
"@nguniversal/common": "5.0.0",
41-
"@nguniversal/express-engine": "5.0.0",
42-
"@nguniversal/module-map-ngfactory-loader": "5.0.0",
43-
"@ngx-meta/core": "5.0.0",
44-
"@ngx-translate/core": "9.1.1",
45-
"@ngx-translate/http-loader": "2.0.1",
30+
"@angular/animations": "6.0.3",
31+
"@angular/common": "6.0.3",
32+
"@angular/compiler": "6.0.3",
33+
"@angular/core": "6.0.3",
34+
"@angular/forms": "6.0.3",
35+
"@angular/http": "6.0.3",
36+
"@angular/platform-browser": "6.0.3",
37+
"@angular/platform-browser-dynamic": "6.0.3",
38+
"@angular/router": "6.0.3",
39+
"@angular/service-worker": "6.0.3",
40+
"@nguniversal/common": "6.0.0",
41+
"@nguniversal/express-engine": "6.0.0",
42+
"@nguniversal/module-map-ngfactory-loader": "6.0.0",
43+
"@ngx-meta/core": "6.0.0-rc.1",
44+
"@ngx-translate/core": "10.0.2",
45+
"@ngx-translate/http-loader": "3.0.1",
4646
"cookie-parser": "1.4.3",
47-
"core-js": "2.5.4",
47+
"core-js": "2.5.7",
4848
"ngx-cookie-service": "1.0.10",
4949
"node-fetch": "2.1.2",
50-
"rxjs": "5.5.8",
51-
"zone.js": "0.8.24"
50+
"rxjs": "6.2.0",
51+
"zone.js": "0.8.26"
5252
},
5353
"devDependencies": {
54-
"@angular/cli": "1.7.3",
55-
"@angular/compiler-cli": "5.2.9",
56-
"@angular/language-service": "5.2.9",
57-
"@angular/platform-server": "5.2.9",
58-
"@types/jasmine": "2.8.6",
54+
"@angular/cli": "6.0.5",
55+
"@angular/compiler-cli": "6.0.3",
56+
"@angular/language-service": "6.0.3",
57+
"@angular/platform-server": "6.0.3",
58+
"@types/jasmine": "2.8.7",
5959
"@types/jasminewd2": "2.0.3",
60-
"@types/node": "9.6.1",
61-
"codelyzer": "4.2.1",
60+
"@types/node": "10.1.3",
61+
"codelyzer": "4.3.0",
6262
"jasmine-core": "3.1.0",
6363
"jasmine-spec-reporter": "4.2.1",
64-
"karma": "2.0.0",
64+
"karma": "2.0.2",
6565
"karma-chrome-launcher": "2.2.0",
6666
"karma-cli": "1.0.1",
67-
"karma-coverage-istanbul-reporter": "1.4.2",
68-
"karma-jasmine": "1.1.1",
69-
"karma-jasmine-html-reporter": "1.0.0",
70-
"nodemon": "1.17.3",
71-
"preboot": "6.0.0-beta.3",
72-
"protractor": "5.3.0",
73-
"ssri": "5.3.0",
74-
"tslint": "5.9.1",
75-
"typescript": "2.6.2",
76-
"ng-packagr":"2.4.5"
67+
"karma-coverage-istanbul-reporter": "2.0.1",
68+
"karma-jasmine": "1.1.2",
69+
"karma-jasmine-html-reporter": "1.1.0",
70+
"nodemon": "1.17.5",
71+
"preboot": "6.0.0-beta.4",
72+
"protractor": "5.3.2",
73+
"ssri": "6.0.0",
74+
"tslint": "5.10.0",
75+
"typescript": "2.7.2",
76+
"ng-packagr": "3.0.0",
77+
"@angular-devkit/build-angular": "~0.6.5"
7778
}
7879
}

‎src/app/app.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Component } from '@angular/core';
22

33
import { MetaService } from '@ngx-meta/core';
4-
import 'rxjs/add/operator/filter';
5-
import 'rxjs/add/operator/first';
6-
import 'rxjs/add/operator/do';
7-
import 'rxjs/add/observable/fromPromise';
4+
5+
6+
7+
88

99
@Component({
1010
selector: 'app-root',

0 commit comments

Comments
 (0)