Skip to content

Commit

Permalink
Merge 834a81a into 2c0c981
Browse files Browse the repository at this point in the history
  • Loading branch information
dkamburov committed Nov 7, 2018
2 parents 2c0c981 + 834a81a commit 2b14b4c
Show file tree
Hide file tree
Showing 120 changed files with 3,007 additions and 7,597 deletions.
26 changes: 13 additions & 13 deletions package.json
Expand Up @@ -7,27 +7,27 @@
"url": "https://github.com/IgniteUI/igniteui-angular-wrappers.git"
},
"dependencies": {
"@angular/common": "^6.0.0",
"@angular/compiler": "^6.0.0",
"@angular/core": "^6.0.0",
"@angular/http": "^6.0.0",
"@angular/forms": "^6.0.0",
"@angular/platform-browser": "^6.0.0",
"@angular/platform-browser-dynamic": "^6.0.0",
"@angular/router": "^6.0.0",
"@angular/upgrade": "^6.0.0",
"@angular/common": "~7.0.0",
"@angular/compiler": "~7.0.0",
"@angular/core": "~7.0.0",
"@angular/http": "~7.0.0",
"@angular/forms": "~7.0.0",
"@angular/platform-browser": "~7.0.0",
"@angular/platform-browser-dynamic": "~7.0.0",
"@angular/router": "~7.0.0",
"@angular/upgrade": "~7.0.0",
"angular-in-memory-web-api": "~0.6.0",
"core-js": "^2.5.4",
"systemjs": "0.19.40",
"es6-shim": "^0.35.0",
"reflect-metadata": "^0.1.3",
"rxjs": "^6.0.0",
"rxjs": "~6.3.3",
"zone.js": "^0.8.26",
"bootstrap": "^4.1.3"
},
"devDependencies": {
"jquery-mockjax": "2.2.2",
"@angular/compiler-cli": "^6.0.0",
"@angular/compiler-cli": "~7.0.0",
"concurrently": "^3.2.0",
"gulp-watch": "^4.3.5",
"jasmine-core": "^2.4.1",
Expand All @@ -38,10 +38,10 @@
"karma-coverage": "",
"karma-remap-istanbul": "0.5.0",
"lite-server": "^2.2.2",
"typescript": "~2.7.2",
"typescript": "~3.1.1",
"coveralls": "^2.11.9",
"traceur": "^0.0.111",
"@types/node": "^6.0.46",
"@types/node": "~8.9.4",
"@types/jasmine": "^2.5.36",
"@types/reflect-metadata": "^0.0.5",
"@types/ignite-ui": "^18.1.1",
Expand Down
40 changes: 24 additions & 16 deletions samples/aot/samples/igGrid-AoT/app.module.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions samples/aot/samples/igGrid-AoT/app.module.ngfactory.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion samples/aot/samples/igGrid-AoT/app.module.ngsummary.json

Large diffs are not rendered by default.

119 changes: 32 additions & 87 deletions samples/aot/src/igbulletgraph/igbulletgraph.component.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2b14b4c

Please sign in to comment.