Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: bump ng-zorro to 17.3 #1778

Merged
merged 3 commits into from
Mar 13, 2024
Merged

chore: bump ng-zorro to 17.3 #1778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b3f290
chore: bump ng-zorro to 17.3
cipchk Mar 12, 2024
0a75201
chore: fix test
cipchk Mar 12, 2024
ce853b2
chore: update icon list
cipchk Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"extend": "^3.0.2",
"file-saver": "^2.0.5",
"ng-github-button": "^17.0.0",
"ng-zorro-antd": "^17.2.0",
"ng-zorro-antd": "^17.3.0",
"@angular/cdk": "^17.2.0",
"ngx-countdown": "^17.1.1",
"ngx-highlight-js": "^17.0.0",
Expand Down
3 changes: 2 additions & 1 deletion packages/abc/cell/cell.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { of } from 'rxjs';
import { cleanCdkOverlayHtml, createTestContext } from '@delon/testing';
import { WINDOW } from '@delon/util/token';
import { NzSafeAny } from 'ng-zorro-antd/core/types';
import { NzIconTestModule } from 'ng-zorro-antd/icon/testing';
import { NzImageService } from 'ng-zorro-antd/image';
import { NzTooltipDirective } from 'ng-zorro-antd/tooltip';

Expand All @@ -28,7 +29,7 @@ describe('abc: cell', () => {

const moduleAction = (): void => {
TestBed.configureTestingModule({
imports: [CellModule, NoopAnimationsModule, BrowserModule, RouterTestingModule.withRoutes([])],
imports: [CellModule, NoopAnimationsModule, BrowserModule, RouterTestingModule.withRoutes([]), NzIconTestModule],
declarations: [TestComponent, TestWidget]
});
};
Expand Down
3 changes: 2 additions & 1 deletion packages/form/widgets/upload/widget.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { By } from '@angular/platform-browser';

import { createTestContext } from '@delon/testing';
import { NzSafeAny } from 'ng-zorro-antd/core/types';
import { NzIconTestModule } from 'ng-zorro-antd/icon/testing';
import { NzImageModule, NzImageService } from 'ng-zorro-antd/image';
import { NzUploadComponent } from 'ng-zorro-antd/upload';

Expand All @@ -18,7 +19,7 @@ describe('form: widget: upload', () => {
let dl: DebugElement;
const widget = 'upload';

configureSFTestSuite({ widgets: [withUploadWidget()], imports: [NzImageModule] });
configureSFTestSuite({ widgets: [withUploadWidget()], imports: [NzImageModule, NzIconTestModule] });

beforeEach(() => {
({ fixture, dl, context } = createTestContext(TestFormComponent));
Expand Down
12 changes: 7 additions & 5 deletions schematics/plugin/plugin.icon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import { getSourceFile } from '../utils';

// includes ng-zorro-antd & @delon/*
const WHITE_ICONS = [
// - zorro: https://github.com/NG-ZORRO/ng-zorro-antd/blob/master/components/icon/icons.ts
// new Array(...new Set([...document.querySelectorAll('.pl-smi')].map(el => el.innerText).filter(val => /(Fill|Outline)$/g.test(val))))
// - zorro: https://raw.githubusercontent.com/NG-ZORRO/ng-zorro-antd/master/components/icon/icons.ts
// new Array(...new Set(document.querySelector('pre').innerText.split('\n').map(t => t.trim()).filter(val => /(Fill|Outline)[,]?$/g.test(val)))).map(v => v.substring(0, v.length - 1))
'BarsOutline',
'CalendarOutline',
'CaretDownFill',
Expand Down Expand Up @@ -55,12 +55,14 @@ const WHITE_ICONS = [
'UpOutline',
'VerticalAlignTopOutline',
'ZoomInOutline',
'ZoomOutOutline',
// - @delon: https://github.com/ng-alain/delon/blob/master/packages/theme/src/theme.module.ts#L33
'ZoomOutOutlin',
// - @delon: https://github.com/ng-alain/delon/blob/master/packages/theme/src/provide.ts#L15
'BellOutline',
'DeleteOutline',
'PlusOutline',
'InboxOutline'
'InboxOutline',
'MenuFoldOutline',
'MenuUnfoldOutline'
];

const ATTRIBUTES = {
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7445,7 +7445,7 @@ __metadata:
ng-github-button: "npm:^17.0.0"
ng-less-javascript-enabled-patch: "npm:17.0.2"
ng-packagr: "npm:^17.2.0"
ng-zorro-antd: "npm:^17.2.0"
ng-zorro-antd: "npm:^17.3.0"
ngx-countdown: "npm:^17.1.1"
ngx-highlight-js: "npm:^17.0.0"
ngx-tinymce: "npm:^17.0.0"
Expand Down Expand Up @@ -13109,9 +13109,9 @@ __metadata:
languageName: node
linkType: hard

"ng-zorro-antd@npm:^17.2.0":
version: 17.2.0
resolution: "ng-zorro-antd@npm:17.2.0"
"ng-zorro-antd@npm:^17.3.0":
version: 17.3.0
resolution: "ng-zorro-antd@npm:17.3.0"
dependencies:
"@angular/cdk": "npm:^17.0.0"
"@ant-design/icons-angular": "npm:^17.0.0"
Expand All @@ -13124,7 +13124,7 @@ __metadata:
"@angular/forms": ^17.0.0
"@angular/platform-browser": ^17.0.0
"@angular/router": ^17.0.0
checksum: d73a14650bb9f635bf6fe2e51e1c302052b243d3ad660fce5201fcb3d4da60c554de57a5c281ea11b150b6009ec2bd8c78cff016d8281841b1518eceeeb32126
checksum: c95dee5feec83aab3bef5517dbf33df4486089cfc4efe039685c8d7fb4afb7d816bd42ad09cdcf1aa5455b07aeb873f51a7cec1eb94b925454d1c6a61718d0e9
languageName: node
linkType: hard

Expand Down
Loading