From a3309364639fb7ccd588022434c34258128246fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=A1=E8=89=B2?= Date: Wed, 13 Mar 2024 13:58:37 +0800 Subject: [PATCH] chore: bump ng-zorro to 17.3 (#1778) --- package.json | 2 +- packages/abc/cell/cell.spec.ts | 3 ++- packages/form/widgets/upload/widget.spec.ts | 3 ++- schematics/plugin/plugin.icon.ts | 12 +++++++----- yarn.lock | 10 +++++----- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 37b6fe79f..ccd331eab 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/packages/abc/cell/cell.spec.ts b/packages/abc/cell/cell.spec.ts index 6b36ef8b6..a2163a177 100644 --- a/packages/abc/cell/cell.spec.ts +++ b/packages/abc/cell/cell.spec.ts @@ -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'; @@ -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] }); }; diff --git a/packages/form/widgets/upload/widget.spec.ts b/packages/form/widgets/upload/widget.spec.ts index 3225cf9b0..d1639f825 100644 --- a/packages/form/widgets/upload/widget.spec.ts +++ b/packages/form/widgets/upload/widget.spec.ts @@ -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'; @@ -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)); diff --git a/schematics/plugin/plugin.icon.ts b/schematics/plugin/plugin.icon.ts index 3a8abcb45..2924ba95f 100644 --- a/schematics/plugin/plugin.icon.ts +++ b/schematics/plugin/plugin.icon.ts @@ -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', @@ -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 = { diff --git a/yarn.lock b/yarn.lock index 8de3ea835..074425bdf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" @@ -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" @@ -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