chore: bump angular from 12.x to 13 #7050

simplejason · 2021-11-11T11:02:23Z

close #7044

TODO

Upgrade to angular v13 ( Angular Update Guide )
Upgrade @angular/cdk to v13
Testing Ivy to build & tests ( CLI Issue | NG3003 Error )
~~Update official document~~
update icons to v13 @wendellhu95 , latest @13.0.0-beta.0

PR Checklist

Please check if your PR fulfills the following requirements:

The commit message follows our guidelines: https://github.com/NG-ZORRO/ng-zorro-antd/blob/master/CONTRIBUTING.md#commit
Tests for the changes have been added (for bug fixes / features)
Docs have been added / updated (for bug fixes / features)

PR Type

What kind of change does this PR introduce?

[ ] Bugfix
[ ] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[ ] Build related changes
[ ] CI related changes
[ ] Documentation content changes
[ ] Application (the showcase website) / infrastructure changes
[ ] Other... Please describe:

What is the current behavior?

Issue Number: N/A

What is the new behavior?

Does this PR introduce a breaking change?

[ ] Yes
[ ] No

Other information

zorro-bot · 2021-11-11T11:02:26Z

This preview will be available after the AzureCI is passed.

package.json

codecov · 2021-11-18T03:59:32Z

Codecov Report

Merging #7050 (307a685) into master (5cd40b4) will increase coverage by 1.96%.
The diff coverage is 67.74%.

❗ Current head 307a685 differs from pull request most recent head 6921d7a. Consider uploading reports for the commit 6921d7a to get more accurate results

@@            Coverage Diff             @@
##           master    #7050      +/-   ##
==========================================
+ Coverage   89.71%   91.67%   +1.96%     
==========================================
  Files         488      486       -2     
  Lines       15945    15954       +9     
  Branches     2579     2589      +10     
==========================================
+ Hits        14305    14626     +321     
- Misses       1007     1014       +7     
+ Partials      633      314     -319

Impacted Files	Coverage Δ
components/menu/menu-item.directive.ts	`76.38% <25.00%> (-0.43%)`	⬇️
components/tabs/tabset.component.ts	`91.83% <40.00%> (+2.25%)`	⬆️
components/core/overlay/nz-connected-overlay.ts	`80.00% <71.42%> (-5.72%)`	⬇️
components/form/form-control.component.ts	`95.90% <100.00%> (+2.45%)`	⬆️
components/popconfirm/popconfirm.ts	`98.71% <100.00%> (+2.56%)`	⬆️
components/popover/popover.ts	`100.00% <100.00%> (ø)`
components/tooltip/base.ts	`94.00% <100.00%> (+0.46%)`	⬆️
components/tooltip/tooltip.ts	`100.00% <100.00%> (ø)`
components/test.ts
components/core/environments/environment.test.ts
... and 124 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5cd40b4...6921d7a. Read the comment docs.

wzhudev · 2021-12-14T15:45:18Z

@simplejason I updated icons in commt eb352ef.

qtopie · 2021-12-15T16:25:38Z

Just provide some useful links, pls check this related PR and solved issue of Angular CLI. Hope Angular 13 will be supported soon.

bgramaje · 2021-12-16T10:32:59Z

Hi! I can't install Ng Zorro in my angular project.

npm ERR! code ERESOLVE
npm ERR! ERESOLVE unable to resolve dependency tree
npm ERR!
npm ERR! While resolving: [email protected]
npm ERR! Found: @angular/[email protected]
npm ERR! node_modules/@angular/animations
npm ERR! @angular/animations@"~13.0.3" from the root project
npm ERR!
npm ERR! Could not resolve dependency:
npm ERR! peer @angular/animations@"^12.1.0" from [email protected]
npm ERR! node_modules/ng-zorro-antd
npm ERR! ng-zorro-antd@"12.1.0" from the root project
npm ERR!
npm ERR! Fix the upstream dependency conflict, or retry
npm ERR! this command with --force, or --legacy-peer-deps
npm ERR! to accept an incorrect (and potentially broken) dependency resolution.

simplejason · 2021-12-18T08:53:27Z

Hi! I can't install Ng Zorro in my angular project.

npm ERR! code ERESOLVE npm ERR! ERESOLVE unable to resolve dependency tree npm ERR! npm ERR! While resolving: [email protected] npm ERR! Found: @angular/[email protected] npm ERR! node_modules/@angular/animations npm ERR! @angular/animations@"~13.0.3" from the root project npm ERR! npm ERR! Could not resolve dependency: npm ERR! peer @angular/animations@"^12.1.0" from [email protected] npm ERR! node_modules/ng-zorro-antd npm ERR! ng-zorro-antd@"12.1.0" from the root project npm ERR! npm ERR! Fix the upstream dependency conflict, or retry npm ERR! this command with --force, or --legacy-peer-deps npm ERR! to accept an incorrect (and potentially broken) dependency resolution.

[email protected] is not released now

maratkalibek · 2021-12-20T10:23:24Z

I'm curious about the release with Angular 13 support. Is this PR ready to be merged? @simplejason are you waiting only for approval? Or more work to be done in this PR?

simplejason · 2021-12-21T09:42:53Z

I'm curious about the release with Angular 13 support. Is this PR ready to be merged? @simplejason are you waiting only for approval? Or more work to be done in this PR?

It's ready to merge now, only wait to review, I think v13 will be coming soon in this week.

simplejason · 2021-12-22T07:47:27Z

@hsuanxyz @yangjunhan @wendellhu95 @wenqi73 Hi all, the changes about v13 have been committed, if no request changes are suggested, we can merge this PR to master today. And then we need to prepare the upgrade documentation to ensure that users can successfully upgrade from v12 to v13.

hsuanxyz · 2021-12-22T09:16:02Z

components/core/overlay/nz-connected-overlay.ts

@@ -36,7 +36,7 @@ export class NzConnectedOverlayDirective {
  }

  private updateArrowPosition(position: ConnectedOverlayPositionChange): void {
-    const originEl = this.cdkConnectedOverlay.origin.elementRef.nativeElement as HTMLElement;
+    const originEl = (this.cdkConnectedOverlay.origin as ElementRef).nativeElement as HTMLElement;


Could this be another types?

https://github.com/angular/components/blob/59002e1649/src/cdk/overlay/overlay-directives.ts#L397
https://github.com/angular/components/blob/59002e1649123922df3532f4be78c485a73c5bc1/src/cdk/overlay/position/flexible-connected-position-strategy.ts#L1138

hsuanxyz · 2021-12-22T09:20:17Z

components/form/form-control.component.ts

@@ -134,7 +134,7 @@ export class NzFormControlComponent implements OnChanges, OnDestroy, OnInit, Aft
    this.validateChanges.unsubscribe();
    /** miss detect https://github.com/angular/angular/issues/10887 **/
    if (this.validateControl && this.validateControl.statusChanges) {
-      this.validateChanges = this.validateControl.statusChanges
+      this.validateChanges = (this.validateControl.statusChanges as Observable<string>)


Suggested change

this.validateChanges = (this.validateControl.statusChanges as Observable<string>)

this.validateChanges = (this.validateControl.statusChanges as Observable<SafeAny>)

hsuanxyz · 2021-12-22T09:37:54Z

scripts/site/generate-site.js

@@ -41,7 +41,7 @@ function generate(target) {
      }
    }
    const componentDirPath = path.join(rootPath, componentName);
-    const skips = ['style', 'core', 'locale', 'cdk', 'i18n', 'version', 'experimental'];
+    const skips = ['style', 'core', 'locale', 'cdk', 'i18n', 'version', 'experimental', 'node_modules'];


Suggested change

const skips = ['style', 'core', 'locale', 'cdk', 'i18n', 'version', 'experimental', 'node_modules'];

const skips = ['style', 'core', 'locale', 'cdk', 'i18n', 'version', 'experimental'];

wzhudev

LGTM

hsuanxyz

LGTM

RoboZoom · 2021-12-24T20:50:32Z

It's fantastic that this is merged, but the latest release on the home page still is version 12.1.1 and references Angular v12. Are you planning on updating the release version number for this?

Thanks for the work!

FOWind · 2021-12-28T07:37:40Z

When will it release after merged?

hsuanxyz · 2021-12-28T08:37:32Z

@FOWind #7158

simplejason requested review from danranVm, hsuanxyz, vthinkxie and wzhudev as code owners November 11, 2021 11:02

wzhudev reviewed Nov 11, 2021

View reviewed changes

package.json Outdated Show resolved Hide resolved

simplejason force-pushed the chore/upgrade branch from 35345d1 to b09573c Compare November 15, 2021 06:35

simplejason changed the title ~~WIP chore: bump angular from 12.x to 13~~ chore: bump angular from 12.x to 13 Nov 18, 2021

pr-triage bot added the PR: unreviewed label Nov 18, 2021

simplejason requested a review from yangjunhan November 18, 2021 08:10

simplejason force-pushed the chore/upgrade branch 2 times, most recently from 7cebd93 to df7f8e8 Compare November 24, 2021 03:36

simplejason and others added 11 commits December 21, 2021 17:49

chore: bump angular from 12.x to 13

f77f6a4

build(module:icon): update icon to v13

b335041

chore: bump cdk to v13 & enable Ivy

e027038

chore: fix test components in v13

19d10af

chore: refactor some components with circle dependency for partial ivy

cb78281

chore: remove partial mode

1a4b49e

chore: revert last commit and remove deprecated polyfill of site

aea942c

chore: rebase and fix cdk overlay

4579b2e

docs: add icons

e7a354b

fix(module:docs): fix icon display

a30b161

chore: remove unused codes and bugs of building

d142e1d

simplejason added 2 commits December 21, 2021 17:50

chore: update package.json with stable version

02743e6

chore: skip node_modules when building site

9f8bdee

simplejason force-pushed the chore/upgrade branch from 97c4e36 to 9f8bdee Compare December 21, 2021 11:24

chore: fix icon display error

0bba893

simplejason requested a review from wenqi73 December 22, 2021 07:46

hsuanxyz requested changes Dec 22, 2021

View reviewed changes

pr-triage bot added PR: reviewed-changes-requested and removed PR: unreviewed labels Dec 22, 2021

chore: fix as request changes

6921d7a

pr-triage bot added PR: unreviewed and removed PR: reviewed-changes-requested labels Dec 22, 2021

wzhudev approved these changes Dec 23, 2021

View reviewed changes

pr-triage bot added PR: partially-approved and removed PR: unreviewed labels Dec 23, 2021

hsuanxyz approved these changes Dec 23, 2021

View reviewed changes

hsuanxyz merged commit 7c11bb1 into NG-ZORRO:master Dec 23, 2021

pr-triage bot added PR: merged and removed PR: partially-approved labels Dec 23, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: bump angular from 12.x to 13 #7050

chore: bump angular from 12.x to 13 #7050

simplejason commented Nov 11, 2021 •

edited

Loading

zorro-bot bot commented Nov 11, 2021

codecov bot commented Nov 18, 2021 •

edited

Loading

wzhudev commented Dec 14, 2021

qtopie commented Dec 15, 2021

bgramaje commented Dec 16, 2021

simplejason commented Dec 18, 2021

maratkalibek commented Dec 20, 2021

simplejason commented Dec 21, 2021

simplejason commented Dec 22, 2021

hsuanxyz Dec 22, 2021

hsuanxyz Dec 22, 2021

hsuanxyz Dec 22, 2021

hsuanxyz Dec 22, 2021

wzhudev left a comment

hsuanxyz left a comment

RoboZoom commented Dec 24, 2021

FOWind commented Dec 28, 2021 •

edited

Loading

hsuanxyz commented Dec 28, 2021

	this.validateChanges = (this.validateControl.statusChanges as Observable<string>)
	this.validateChanges = (this.validateControl.statusChanges as Observable<SafeAny>)

	const skips = ['style', 'core', 'locale', 'cdk', 'i18n', 'version', 'experimental', 'node_modules'];
	const skips = ['style', 'core', 'locale', 'cdk', 'i18n', 'version', 'experimental'];

chore: bump angular from 12.x to 13 #7050

chore: bump angular from 12.x to 13 #7050

Conversation

simplejason commented Nov 11, 2021 • edited Loading

TODO

PR Checklist

PR Type

What is the current behavior?

What is the new behavior?

Does this PR introduce a breaking change?

Other information

zorro-bot bot commented Nov 11, 2021

codecov bot commented Nov 18, 2021 • edited Loading

Codecov Report

wzhudev commented Dec 14, 2021

qtopie commented Dec 15, 2021

bgramaje commented Dec 16, 2021

simplejason commented Dec 18, 2021

maratkalibek commented Dec 20, 2021

simplejason commented Dec 21, 2021

simplejason commented Dec 22, 2021

hsuanxyz Dec 22, 2021

Choose a reason for hiding this comment

hsuanxyz Dec 22, 2021

Choose a reason for hiding this comment

hsuanxyz Dec 22, 2021

Choose a reason for hiding this comment

hsuanxyz Dec 22, 2021

Choose a reason for hiding this comment

wzhudev left a comment

Choose a reason for hiding this comment

hsuanxyz left a comment

Choose a reason for hiding this comment

RoboZoom commented Dec 24, 2021

FOWind commented Dec 28, 2021 • edited Loading

hsuanxyz commented Dec 28, 2021

simplejason commented Nov 11, 2021 •

edited

Loading

codecov bot commented Nov 18, 2021 •

edited

Loading

FOWind commented Dec 28, 2021 •

edited

Loading