Skip to content

Commit 7e15a19

Browse files
authored
Merge branch '9.0.x' into ibarakov/fix-6520-9.0.x
2 parents 010676b + 55c61df commit 7e15a19

File tree

55 files changed

+1876
-2261
lines changed

Some content is hidden

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

55 files changed

+1876
-2261
lines changed

package-lock.json

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

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,12 @@
5353
"@angular/platform-browser-dynamic": "^9.0.0",
5454
"@angular/router": "^9.0.0",
5555
"@types/hammerjs": "^2.0.36",
56+
"@types/jszip": "^3.1.7",
5657
"@types/source-map": "0.5.2",
5758
"classlist.js": "^1.1.20150312",
5859
"core-js": "^2.6.2",
5960
"hammerjs": "^2.0.8",
60-
"jszip": "^3.1.5",
61+
"jszip": "^3.3.0",
6162
"resize-observer-polyfill": "^1.5.1",
6263
"rxjs": "^6.5.4",
6364
"tslib": "^1.10.0",

projects/igniteui-angular/ng-package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
},
88
"whitelistedNonPeerDependencies": [
99
"@types/hammerjs",
10+
"@types/jszip",
1011
"hammerjs",
1112
"jszip",
1213
"resize-observer-polyfill"

projects/igniteui-angular/ng-package.prod.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
},
1111
"whitelistedNonPeerDependencies": [
1212
"@types/hammerjs",
13+
"@types/jszip",
1314
"hammerjs",
1415
"jszip",
1516
"resize-observer-polyfill"

projects/igniteui-angular/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@
6767
],
6868
"dependencies": {
6969
"@types/hammerjs": "^2.0.36",
70+
"@types/jszip": "^3.1.7",
7071
"hammerjs": "^2.0.8",
71-
"jszip": "^3.1.5",
72+
"jszip": "^3.3.0",
7273
"resize-observer-polyfill": "^1.5.1"
7374
},
7475
"peerDependencies": {

0 commit comments

Comments
 (0)