Skip to content

Commit dd69c3d

Browse files
authored
Merge pull request #1 from LFeh/master
Fix bugs to start project
2 parents 9950e59 + 0d21ac7 commit dd69c3d

File tree

2 files changed

+39
-41
lines changed

2 files changed

+39
-41
lines changed

angular-cli.json

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,26 @@
33
"version": "1.0.0-beta.15",
44
"name": "front-end-challenge"
55
},
6-
"apps": [
7-
{
8-
"root": "src",
9-
"outDir": "dist",
10-
"assets": "assets",
11-
"index": "index.html",
12-
"main": "main.ts",
13-
"test": "test.ts",
14-
"tsconfig": "tsconfig.json",
15-
"prefix": "app",
16-
"mobile": false,
17-
"styles": [
18-
"styles.css"
19-
],
20-
"scripts": [],
21-
"environments": {
22-
"source": "environments/environment.ts",
23-
"dev": "environments/environment.ts",
24-
"prod": "environments/environment.prod.ts"
25-
}
6+
"apps": [{
7+
"root": "src",
8+
"outDir": "dist",
9+
"assets": "assets",
10+
"index": "index.html",
11+
"main": "main.ts",
12+
"test": "test.ts",
13+
"tsconfig": "tsconfig.json",
14+
"prefix": "app",
15+
"mobile": false,
16+
"styles": [
17+
"styles.css"
18+
],
19+
"scripts": [],
20+
"environmentSource": "environments/environment.ts",
21+
"environments": {
22+
"dev": "environments/environment.ts",
23+
"prod": "environments/environment.prod.ts"
2624
}
27-
],
25+
}],
2826
"addons": [],
2927
"packages": [],
3028
"e2e": {

package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,33 @@
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@angular/common": "2.0.0",
16-
"@angular/compiler": "2.0.0",
17-
"@angular/core": "2.0.0",
18-
"@angular/forms": "2.0.0",
19-
"@angular/http": "2.0.0",
20-
"@angular/platform-browser": "2.0.0",
21-
"@angular/platform-browser-dynamic": "2.0.0",
22-
"@angular/router": "3.0.0",
15+
"@angular/common": "2.4.8",
16+
"@angular/compiler": "2.4.8",
17+
"@angular/core": "2.4.8",
18+
"@angular/forms": "2.4.8",
19+
"@angular/http": "2.4.8",
20+
"@angular/platform-browser": "2.4.8",
21+
"@angular/platform-browser-dynamic": "2.4.8",
22+
"@angular/router": "3.4.8",
2323
"core-js": "^2.4.1",
24-
"rxjs": "5.0.0-beta.12",
24+
"rxjs": "5.1.1",
2525
"ts-helpers": "^1.1.1",
26-
"zone.js": "^0.6.23"
26+
"zone.js": "^0.7.7"
2727
},
2828
"devDependencies": {
2929
"@types/jasmine": "^2.2.30",
30-
"angular-cli": "1.0.0-beta.15",
31-
"codelyzer": "~0.0.26",
32-
"jasmine-core": "2.4.1",
33-
"jasmine-spec-reporter": "2.5.0",
34-
"karma": "1.2.0",
30+
"@angular/cli": "1.0.0-beta.32.3",
31+
"codelyzer": "~2.0.1",
32+
"jasmine-core": "2.5.2",
33+
"jasmine-spec-reporter": "3.2.0",
34+
"karma": "1.4.0",
3535
"karma-chrome-launcher": "^2.0.0",
3636
"karma-cli": "^1.0.1",
3737
"karma-jasmine": "^1.0.2",
38-
"karma-remap-istanbul": "^0.2.1",
39-
"protractor": "4.0.5",
40-
"ts-node": "1.2.1",
41-
"tslint": "3.13.0",
42-
"typescript": "2.0.2"
38+
"karma-remap-istanbul": "^0.6.0",
39+
"protractor": "5.1.1",
40+
"ts-node": "2.1.0",
41+
"tslint": "4.4.2",
42+
"typescript": "2.1.6"
4343
}
4444
}

0 commit comments

Comments
 (0)