Skip to content

Commit 2e46a39

Browse files
authored
Merge pull request #269 from IgniteUI/dkamburov/update-angular6
Update to Angular 6 and fix demo with HttpClient
2 parents 26b7c74 + 6e54656 commit 2e46a39

File tree

188 files changed

+14740
-4592
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+14740
-4592
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
node_js:
3-
- '5'
3+
- '8'
44
before_install:
55
- export CHROME_BIN=chromium-browser
66
- export DISPLAY=:99.0

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.20/system-polyfills.js"></script>
1717
<script src="https://unpkg.com/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
1818

19-
<script src="https://unpkg.com/zone.js@0.6.23?main=browser"></script>
19+
<script src="https://unpkg.com/zone.js@0.8.26?main=browser"></script>
2020
<script src="https://unpkg.com/[email protected]/lib/typescript.js"></script>
2121
<script src="https://unpkg.com/[email protected]"></script>
2222
<script src="https://unpkg.com/[email protected]/dist/system.src.js"></script>

package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@
77
"url": "https://github.com/IgniteUI/igniteui-angular-wrappers.git"
88
},
99
"dependencies": {
10-
"@angular/common": "^5.0.1",
11-
"@angular/compiler": "^5.0.1",
12-
"@angular/core": "^5.0.1",
13-
"@angular/http": "^5.0.1",
14-
"@angular/forms": "^5.0.1",
15-
"@angular/platform-browser": "^5.0.1",
16-
"@angular/platform-browser-dynamic": "^5.0.1",
17-
"@angular/router": "^5.0.1",
18-
"@angular/upgrade": "^5.0.1",
19-
"angular-in-memory-web-api": "~0.3.0",
20-
"core-js": "^2.4.1",
10+
"@angular/common": "^6.0.0",
11+
"@angular/compiler": "^6.0.0",
12+
"@angular/core": "^6.0.0",
13+
"@angular/http": "^6.0.0",
14+
"@angular/forms": "^6.0.0",
15+
"@angular/platform-browser": "^6.0.0",
16+
"@angular/platform-browser-dynamic": "^6.0.0",
17+
"@angular/router": "^6.0.0",
18+
"@angular/upgrade": "^6.0.0",
19+
"angular-in-memory-web-api": "~0.6.0",
20+
"core-js": "^2.5.4",
2121
"systemjs": "0.19.40",
2222
"es6-shim": "^0.35.0",
2323
"reflect-metadata": "^0.1.3",
24-
"rxjs": "^5.5.0",
25-
"zone.js": "^0.8.4",
24+
"rxjs": "^6.0.0",
25+
"zone.js": "^0.8.26",
2626
"bootstrap": "^3.3.6"
2727
},
2828
"devDependencies": {
2929
"jquery-mockjax": "2.2.2",
30-
"@angular/compiler-cli": "^5.0.1",
30+
"@angular/compiler-cli": "^6.0.0",
3131
"concurrently": "^3.2.0",
3232
"gulp-watch": "^4.3.5",
3333
"jasmine-core": "^2.4.1",
@@ -38,7 +38,7 @@
3838
"karma-coverage": "",
3939
"karma-remap-istanbul": "0.5.0",
4040
"lite-server": "^2.2.2",
41-
"typescript": "^2.6.1",
41+
"typescript": "~2.7.2",
4242
"coveralls": "^2.11.9",
4343
"traceur": "^0.0.111",
4444
"@types/node": "^6.0.46",

samples/aot/samples/igGrid-AoT/app.module.js

Lines changed: 95 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)