Skip to content

Commit

Permalink
build: fix ngcc build (#4897)
Browse files Browse the repository at this point in the history
  • Loading branch information
Yadong Xie committed Mar 17, 2020
1 parent f24fedf commit a0a191a
Show file tree
Hide file tree
Showing 17 changed files with 62 additions and 36 deletions.
2 changes: 1 addition & 1 deletion components/date-picker/demo/date-render.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ title:

## en-US

We can customize the rendering of date cells in the calendar by providing a `nzDateRender` function to `DatePicker`.
We can customize the rendering of date cells in the calendar by providing a `nzDateRender` function to `DatePicker`.
2 changes: 1 addition & 1 deletion components/date-picker/demo/disabled-date.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ title:

## en-US

Disabled part of dates and time by `nzDisabledDate` and `nzDisabledTime` respectively.
Disabled part of dates and time by `nzDisabledDate` and `nzDisabledTime` respectively.
2 changes: 1 addition & 1 deletion components/date-picker/demo/disabled.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ title:

## en-US

A disabled state of the `DatePicker`.
A disabled state of the `DatePicker`.
2 changes: 1 addition & 1 deletion components/date-picker/demo/extra-footer.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ title:

## en-US

Render extra footer in panel for customized requirements.
Render extra footer in panel for customized requirements.
2 changes: 1 addition & 1 deletion components/date-picker/demo/format.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ title:

## en-US

We can set the date format by `nzFormat`.
We can set the date format by `nzFormat`.
2 changes: 1 addition & 1 deletion components/date-picker/demo/mode.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ title:

## en-US

Determing which panel to show with `nzMode` and `nzOnPanelChange`.
Determing which panel to show with `nzMode` and `nzOnPanelChange`.
2 changes: 1 addition & 1 deletion components/date-picker/demo/presetted-ranges.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ RangePicker 可以设置常用的 预设范围 提高用户体验。

## en-US

We can set presetted ranges to RangePicker to improve user experience.
We can set presetted ranges to RangePicker to improve user experience.
2 changes: 1 addition & 1 deletion components/date-picker/demo/size.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ title:

## en-US

The input box comes in three sizes. `default` will be used if `nzSize` is omitted.
The input box comes in three sizes. `default` will be used if `nzSize` is omitted.
2 changes: 1 addition & 1 deletion components/date-picker/demo/start-end.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ title:

When `RangePicker` does not satisfied your requirements, try to implement similar functionality with two `DatePicker`.
> * Use the `nzDisabledDate` property to limit the start and end dates.
> * Improve user experience with `nzOpen` and `nzOnOpenChange`.
> * Improve user experience with `nzOpen` and `nzOnOpenChange`.
2 changes: 1 addition & 1 deletion components/date-picker/demo/time.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ title:

## en-US

This property provide an additional time selection. When `nzShowTime` is an Object, its properties will be passed on to built-in `TimePicker`.
This property provide an additional time selection. When `nzShowTime` is an Object, its properties will be passed on to built-in `TimePicker`.
9 changes: 5 additions & 4 deletions components/i18n/public-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
* found in the LICENSE file at https://github.com/NG-ZORRO/ng-zorro-antd/blob/master/LICENSE
*/

export { NzI18nModule } from './nz-i18n.module';
export { NzI18nService } from './nz-i18n.service';
export { NZ_DATE_CONFIG, NzDateConfig } from './date-config';
export * from './nz-i18n.module';
export * from './nz-i18n.service';
export * from './date-config';
export * from './nz-i18n.interface';
export * from './nz-i18n.token';
export * from './date-helper.service';
export * from './nz-i18n.pipe';
export * from './date-helper.service';
export * from './convert-tokens';

export { default as ar_EG } from './languages/ar_EG';
export { default as bg_BG } from './languages/bg_BG';
Expand Down
7 changes: 4 additions & 3 deletions components/menu/menu-group.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ import {
} from '@angular/core';
import { NzIsMenuInsideDropDownToken } from './menu.token';

export function MenuGroupFactory(isMenuInsideDropDownToken: boolean): boolean {
return isMenuInsideDropDownToken ? isMenuInsideDropDownToken : false;
}
@Component({
selector: '[nz-menu-group]',
exportAs: 'nzMenuGroup',
Expand All @@ -30,9 +33,7 @@ import { NzIsMenuInsideDropDownToken } from './menu.token';
/** check if menu inside dropdown-menu component **/
{
provide: NzIsMenuInsideDropDownToken,
useFactory: (isMenuInsideDropDownToken: boolean) => {
return isMenuInsideDropDownToken ? isMenuInsideDropDownToken : false;
},
useFactory: MenuGroupFactory,
deps: [[new SkipSelf(), new Optional(), NzIsMenuInsideDropDownToken]]
}
],
Expand Down
15 changes: 9 additions & 6 deletions components/menu/menu.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ import { NzIsMenuInsideDropDownToken, NzMenuServiceLocalToken } from './menu.tok
import { NzMenuModeType, NzMenuThemeType } from './menu.types';
import { NzSubMenuComponent } from './submenu.component';

export function MenuServiceFactory(serviceInsideDropDown: MenuService, serviceOutsideDropDown: MenuService): MenuService {
return serviceInsideDropDown ? serviceInsideDropDown : serviceOutsideDropDown;
}
export function MenuDropDownTokenFactory(isMenuInsideDropDownToken: boolean): boolean {
return isMenuInsideDropDownToken ? isMenuInsideDropDownToken : false;
}

@Directive({
selector: '[nz-menu]',
exportAs: 'nzMenu',
Expand All @@ -43,17 +50,13 @@ import { NzSubMenuComponent } from './submenu.component';
/** use the top level service **/
{
provide: MenuService,
useFactory: (serviceInsideDropDown: MenuService, serviceOutsideDropDown: MenuService) => {
return serviceInsideDropDown ? serviceInsideDropDown : serviceOutsideDropDown;
},
useFactory: MenuServiceFactory,
deps: [[new SkipSelf(), new Optional(), MenuService], NzMenuServiceLocalToken]
},
/** check if menu inside dropdown-menu component **/
{
provide: NzIsMenuInsideDropDownToken,
useFactory: (isMenuInsideDropDownToken: boolean) => {
return isMenuInsideDropDownToken ? isMenuInsideDropDownToken : false;
},
useFactory: MenuDropDownTokenFactory,
deps: [[new SkipSelf(), new Optional(), NzIsMenuInsideDropDownToken]]
}
],
Expand Down
22 changes: 16 additions & 6 deletions components/modal/public-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,19 @@
*/

export * from './modal-types';
export { NzModalService } from './modal.service';
export { NzModalRef } from './modal-ref';
export { NZ_MODAL_CONFIG, NzModalConfig } from './modal-config';
export { NzModalComponent } from './modal.component';
export { NzModalFooterDirective } from './modal-footer.directive';
export { NzModalModule } from './modal.module';
export * from './modal.service';
export * from './modal-ref';
export * from './modal-config';
export * from './modal.component';
export * from './modal-footer.directive';
export * from './modal.module';
export * from './modal-confirm-container.component';
export * from './modal-container.component';
export * from './modal-container';
export * from './modal-close.component';
export * from './modal-title.component';
export * from './modal-legacy-api';
export * from './modal-types';
export * from './modal-animations';
export * from './modal-footer.component';
export * from './utils';
1 change: 1 addition & 0 deletions components/select/public-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export * from './option.component';
export * from './select.component';
export * from './select.module';
export * from './option-item.component';
export * from './option-item-group.component';
export * from './select-top-control.component';
export * from './select-search.component';
export * from './select-item.component';
Expand Down
20 changes: 17 additions & 3 deletions components/table/public-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,35 @@
* found in the LICENSE file at https://github.com/NG-ZORRO/ng-zorro-antd/blob/master/LICENSE
*/

export * from './src/table/table.component';
export * from './src/table.module';
export * from './src/table.types';
export * from './src/table-data.service';
export * from './src/table-style.service';
export * from './src/table/table.component';
export * from './src/table/table-content.component';
export * from './src/table/table-fixed-row.component';
export * from './src/table/table-inner-default.component';
export * from './src/table/table-inner-scroll.component';
export * from './src/table/table-virtual-scroll.directive';
export * from './src/table/table-fixed-row.component';
export * from './src/table/tbody.component';
export * from './src/table/thead.component';
export * from './src/table/tr.directive';
export * from './src/table/tr-expand.directive';
export * from './src/table/table-virtual-scroll.directive';
export * from './src/table/title-footer.component';
export * from './src/table/tr-measure.component';
export * from './src/cell/cell-fixed.directive';
export * from './src/cell/cell.directive';
export * from './src/cell/th-measure.directive';
export * from './src/cell/td-addon.component';
export * from './src/cell/th-selection.component';
export * from './src/cell/th-addon.component';
export * from './src/addon/filter.component';
export * from './src/addon/row-expand-button.directive';
export * from './src/addon/row-indent.directive';
export * from './src/addon/selection.component';
export * from './src/addon/sorters.component';
export * from './src/addon/filter-trigger.component';
export * from './src/styled/align.directive';
export * from './src/styled/ellipsis.directive';
export * from './src/styled/word-break.directive';
export * from './src/table/table-fixed-row.component';
4 changes: 0 additions & 4 deletions components/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,8 @@
"outDir": "../release",
"alwaysStrict": true,
"declaration": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"importHelpers": true,
"inlineSources": true,
"lib": ["es2018", "dom"],
"moduleResolution": "node",
"sourceMap": true,
"strictFunctionTypes": true,
"stripInternal": true,
Expand Down

0 comments on commit a0a191a

Please sign in to comment.