Skip to content

Commit

Permalink
build: sync zorro 0.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
cipchk committed May 24, 2018
1 parent b975450 commit 3104e93
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 22 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"file-saver": "^1.3.8",
"marked": "^0.3.19",
"ng-github-button": "^1.0.0",
"ng-zorro-antd": "^0.7.0",
"ng-zorro-antd": "^0.7.1",
"ngx-ace-wrapper": "^6.0.0",
"ngx-color": "^1.3.1",
"ngx-countdown": "^3.0.0",
Expand Down
6 changes: 2 additions & 4 deletions packages/abc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@
},
"homepage": "https://github.com/cipchk/delon#readme",
"keywords": ["delon", "ng-alain", "alain", "antd", "ng-zorro-antd"],
"dependencies": {
"peerDependencies": {
"file-saver": "^1.3.3",
"ngx-countdown": "^3.0.0",
"qrious": "^4.0.2"
},
"peerDependencies": {
"qrious": "^4.0.2",
"@delon/theme": "PEER-0.0.0-PLACEHOLDER",
"@delon/util": "PEER-0.0.0-PLACEHOLDER",
"@delon/acl": "PEER-0.0.0-PLACEHOLDER"
Expand Down
2 changes: 1 addition & 1 deletion packages/form/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"antd",
"ng-zorro-antd"
],
"dependencies": {
"peerDependencies": {
"ng-zorro-antd": "ZORRO-0.0.0-PLACEHOLDER",
"@delon/util": "PEER-0.0.0-PLACEHOLDER"
}
Expand Down
8 changes: 4 additions & 4 deletions packages/form/src/widgets/date/date.widget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const DEFAULTFORMAT = 'YYYY-MM-DD HH:mm:ss';
[nzClassName]="ui.className"
[nzDisabledDate]="ui.disabledDate"
[nzLocale]="ui.locale"
[nzPlaceholder]="ui.placeholder"
[nzPlaceHolder]="ui.placeholder"
[nzPopupStyle]="ui.popupStyle"
[nzDropdownClassName]="ui.dropdownClassName"
(nzOnOpenChange)="_openChange($event)"
Expand All @@ -41,7 +41,7 @@ const DEFAULTFORMAT = 'YYYY-MM-DD HH:mm:ss';
[nzClassName]="ui.className"
[nzDisabledDate]="ui.disabledDate"
[nzLocale]="ui.locale"
[nzPlaceholder]="ui.placeholder"
[nzPlaceHolder]="ui.placeholder"
[nzPopupStyle]="ui.popupStyle"
[nzDropdownClassName]="ui.dropdownClassName"
(nzOnOpenChange)="_openChange($event)"
Expand All @@ -57,7 +57,7 @@ const DEFAULTFORMAT = 'YYYY-MM-DD HH:mm:ss';
[nzClassName]="ui.className"
[nzDisabledDate]="ui.disabledDate"
[nzLocale]="ui.locale"
[nzPlaceholder]="ui.placeholder"
[nzPlaceHolder]="ui.placeholder"
[nzPopupStyle]="ui.popupStyle"
[nzDropdownClassName]="ui.dropdownClassName"
(nzOnOpenChange)="_openChange($event)"
Expand All @@ -77,7 +77,7 @@ const DEFAULTFORMAT = 'YYYY-MM-DD HH:mm:ss';
[nzClassName]="ui.className"
[nzDisabledDate]="ui.disabledDate"
[nzLocale]="ui.locale"
[nzPlaceholder]="ui.placeholder"
[nzPlaceHolder]="ui.placeholder"
[nzPopupStyle]="ui.popupStyle"
[nzDropdownClassName]="ui.dropdownClassName"
(nzOnOpenChange)="_openChange($event)"
Expand Down
2 changes: 0 additions & 2 deletions packages/mock/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
"antd",
"ng-zorro-antd"
],
"dependencies": {
},
"peerDependencies": {
}
}
3 changes: 1 addition & 2 deletions packages/schematics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"code generation",
"schematics"
],
"dependencies": {
"peerDependencies": {
"@angular-devkit/core": "^0.6.1",
"@angular-devkit/schematics": "^0.6.1",
"@schematics/angular": "^0.6.1"
Expand All @@ -37,7 +37,6 @@
"@delon/cache",
"@delon/mock",
"@delon/form",
"ng-zorro-antd",
"ng-alain"
]
},
Expand Down
4 changes: 1 addition & 3 deletions packages/theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@
},
"homepage": "https://github.com/cipchk/delon#readme",
"keywords": ["delon", "ng-alain", "alain", "antd", "ng-zorro-antd"],
"dependencies": {
"ng-zorro-antd": "ZORRO-0.0.0-PLACEHOLDER"
},
"peerDependencies": {
"ng-zorro-antd": "ZORRO-0.0.0-PLACEHOLDER",
"@delon/acl": "PEER-0.0.0-PLACEHOLDER"
}
}
2 changes: 1 addition & 1 deletion packages/util/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"utility",
"utils"
],
"dependencies": {
"peerDependencies": {
"extend": "^3.0.1"
}
}
2 changes: 1 addition & 1 deletion scaffold

0 comments on commit 3104e93

Please sign in to comment.