From 3272b826a546e7d708ef22b10d80e0e7610e01df Mon Sep 17 00:00:00 2001 From: Dominique Newkirk Date: Wed, 28 Dec 2022 09:03:42 +0800 Subject: [PATCH] chore: update site for v15 (#7792) --- README-zh_CN.md | 2 +- README.md | 2 +- components/icon/page/index.ts | 4 +- docs/introduce.en-US.md | 2 +- docs/introduce.zh-CN.md | 2 +- docs/join.zh-CN.md | 51 +++++-------------- ...on-v14.en-US.md => migration-v15.en-US.md} | 6 +-- ...on-v14.zh-CN.md => migration-v15.zh-CN.md} | 8 +-- package.json | 2 +- scripts/prerender/route-paths.txt | 4 +- .../_site/doc/app/header/header.component.ts | 14 ++++- .../doc/app/online-ide/files/angular.json.ts | 12 ++++- .../online-ide/files/ng-zorro-antd.module.ts | 4 ++ .../doc/app/online-ide/online-ide.service.ts | 28 ++++++---- 14 files changed, 73 insertions(+), 68 deletions(-) rename docs/{migration-v14.en-US.md => migration-v15.en-US.md} (77%) rename docs/{migration-v14.zh-CN.md => migration-v15.zh-CN.md} (71%) diff --git a/README-zh_CN.md b/README-zh_CN.md index 547afd6ae..4cc557f20 100644 --- a/README-zh_CN.md +++ b/README-zh_CN.md @@ -47,7 +47,7 @@ NG-ZORRO ## 🖥 支持环境 -- Angular `^14.0.0` [![npm package](https://img.shields.io/npm/v/ng-zorro-antd.svg?style=flat-square)](https://www.npmjs.org/package/ng-zorro-antd) +- Angular `^15.0.0` [![npm package](https://img.shields.io/npm/v/ng-zorro-antd.svg?style=flat-square)](https://www.npmjs.org/package/ng-zorro-antd) - 支持服务端渲染 - 现代浏览器，[浏览器支持](https://angular.io/guide/browser-support) - [Electron](http://electron.atom.io/) diff --git a/README.md b/README.md index 4c93f0623..4d1dd3124 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ English | [简体中文](README-zh_CN.md) ## 🖥 Environment Support -* Angular `^14.0.0` [![npm package](https://img.shields.io/npm/v/ng-zorro-antd.svg?style=flat-square)](https://www.npmjs.org/package/ng-zorro-antd) +* Angular `^15.0.0` [![npm package](https://img.shields.io/npm/v/ng-zorro-antd.svg?style=flat-square)](https://www.npmjs.org/package/ng-zorro-antd) * Server-side Rendering * Modern browsers including the following [specific versions](https://angular.io/guide/browser-support) * [Electron](http://electron.atom.io/) diff --git a/components/icon/page/index.ts b/components/icon/page/index.ts index dae9ea64b..526012105 100644 --- a/components/icon/page/index.ts +++ b/components/icon/page/index.ts @@ -575,7 +575,7 @@ export class NzPageDemoIconComponent implements OnInit, OnDestroy { script.type = 'text/javascript'; script.src = source; script.onload = async () => { - await window.antdIconClassifier.load(); + await window.antdIconClassifier?.load(); this.onLoad(); }; script.onerror = () => { @@ -634,7 +634,7 @@ export class NzPageDemoIconComponent implements OnInit, OnDestroy { private predict = (imgEl: HTMLImageElement): void => { try { - const results = window.antdIconClassifier.predict(imgEl); + const results = window.antdIconClassifier?.predict(imgEl); this.icons = results.map((r: Result) => ({ score: Math.ceil(r.score * 100), type: r.className.replace(/\s/g, '-') diff --git a/docs/introduce.en-US.md b/docs/introduce.en-US.md index ef16802ba..fee9e9c51 100755 --- a/docs/introduce.en-US.md +++ b/docs/introduce.en-US.md @@ -36,7 +36,7 @@ An enterprise-class Angular UI component library based on Ant Design, all compon ## Angular Support -`ng-zorro-antd` keeps the same major version with `@angular/core`, now supports Angular `^14.0.0`. +`ng-zorro-antd` keeps the same major version with `@angular/core`, now supports Angular `^15.0.0`. ## Design Specification diff --git a/docs/introduce.zh-CN.md b/docs/introduce.zh-CN.md index 5b6d139c4..c8138d9c3 100755 --- a/docs/introduce.zh-CN.md +++ b/docs/introduce.zh-CN.md @@ -35,7 +35,7 @@ title: Ant Design of Angular [![npm package](https://img.shields.io/npm/v/ng-zorro-antd.svg?style=flat-square)](https://www.npmjs.org/package/ng-zorro-antd) ## 支持 Angular 版本 -`ng-zorro-antd` 与 `@angular/core` 保持相同的主版本号，目前支持 Angular `^14.0.0` 版本。 +`ng-zorro-antd` 与 `@angular/core` 保持相同的主版本号，目前支持 Angular `^15.0.0` 版本。 ## 设计规范 diff --git a/docs/join.zh-CN.md b/docs/join.zh-CN.md index d0e3960cb..4a8bfbd76 100644 --- a/docs/join.zh-CN.md +++ b/docs/join.zh-CN.md @@ -1,45 +1,18 @@ --- order: 16 -title: 加入我们 +title: 社区招募 --- -阿里云开源大数据平台前端团队是阿里巴巴大数据技术体系的核心团队，以 Apache Flink 为核心打造的大数据实时计算平台，我们的技术团队围绕开源技术体系构建，包括来自 Apache Flink / Hadoop / HBase / Kafka / Hive / Zeppelin 等顶级开源项目的十几位 PMC / Committer 成员。 +NG-ZORRO 经过多年发展，受到的许多开发者的青睐帮助，目前已成为年下载量超 **300+** 万的组件库。 +在此感谢每一位参与社区推广与开发的同学，以及每一位 NG-ZORRO 用户! -## 高级前端工程师/前端开发专家（P6/P7） +## 求贤若渴 +为了更好地提升 NG-ZORRO 的用户体验，我们也期望更多的同学能够参与到组件库的日常开发与社区答疑， +来帮助 NG-ZORRO 快速支持更多用户期待的功能开发与问题修复。 +
+对于有意愿长期参与社区工作的同学，我们也会将各位加入到社区 Member 中来，共同管理 PR 及 Issue 答疑。 -#### 工作职责 -- 深度参与 Ant Design / NG-ZORRO 等 Github 顶级前端开源项目 -- 参与 Apache 顶级项目开发与建设 -- 与国际化团队协作建设实时计算平台（团队一半成员在德国） - -#### 岗位要求 -- 3 年以上前端开发经验，能熟练使用常见类库或框架 -- 熟练掌握 React 、Angular 、Vue 任一前端框架 -- 熟练掌握 CSS3 、HTML5 、ES6 、Gulp 、Webpack 等规范和技术； - -## 前端开发实习（2022届毕业生） - -#### 工作职责 -- 深度参与 Ant Design / NG-ZORRO 等 Github 顶级前端开源项目 -- 参与 Apache 顶级项目开发与建设 -- 与国际化团队协作建设实时计算平台（团队一半成员在德国） - -#### 岗位要求 -- 计算机、通信、数学等相关专业, 有较好的数据结构及算法功底 -- 熟练掌握 CSS3、HTML5、ES6、Webpack 等规范和技术 -- 熟悉 Angular / Vue / React 等任意一种前端框架 - -## 前端工程师（外包岗位） - -#### 工作职责 -- 深度参与 Ant Design / NG-ZORRO 等 Github 顶级前端开源项目 -- 参与 Apache 顶级项目开发与建设 -- 与国际化团队协作建设实时计算平台（团队一半成员在德国） - -#### 岗位要求 -- 良好规范编码风格 -- 熟练掌握 CSS3、HTML5、ES6、Webpack 等规范和技术 -- 熟悉 Angular / Vue / React 等任意一种前端框架 - -工作地点：杭州
-简历投递：yadong.xyd#alibaba-inc.com \ No newline at end of file +## 欢迎咨询 +任何疑问可咨询：simplejason.coder#gmail.com +
+也可进钉钉群进行咨询，再次感谢每一位同学的努力与付出。 \ No newline at end of file diff --git a/docs/migration-v14.en-US.md b/docs/migration-v15.en-US.md similarity index 77% rename from docs/migration-v14.en-US.md rename to docs/migration-v15.en-US.md index a89e349fc..3b9675b39 100755 --- a/docs/migration-v14.en-US.md +++ b/docs/migration-v15.en-US.md @@ -1,6 +1,6 @@ --- order: 15 -title: v14 Migration Guide +title: v15 Migration Guide toc: false --- @@ -8,13 +8,13 @@ This document will help you upgrade from `ng-zorro-antd` 13.x version to 14.x ve ## Before upgrade -1. Make sure `Node.js` >= `14.15.0` or >= `16.10.0`. +1. Make sure `Node.js` >= `14.20.0` or >= `16.13.0` or >= `18.10.0`. 2. Create a new branch, or use other methods to back up the current project. 3. Delete the package-lock.json file. ### 1.Upgrade dependencies -- Upgrade Angular to 14.x version, ref [https://update.angular.io/](https://update.angular.io/). +- Upgrade Angular to 15.x version, ref [https://update.angular.io/](https://update.angular.io/). - Run `ng update @angular/cdk`, if you have used `@angular/cdk`. ### 2.Upgrade NG-ZORRO diff --git a/docs/migration-v14.zh-CN.md b/docs/migration-v15.zh-CN.md similarity index 71% rename from docs/migration-v14.zh-CN.md rename to docs/migration-v15.zh-CN.md index a54d48a7f..f6bd61b96 100755 --- a/docs/migration-v14.zh-CN.md +++ b/docs/migration-v15.zh-CN.md @@ -1,14 +1,14 @@ --- order: 15 -title: v14 升级指南 +title: v15 升级指南 toc: false --- -本文档将帮助你从 `ng-zorro-antd` 13.x 版本升级到 14.x 版本。 +本文档将帮助你从 `ng-zorro-antd` 14.x 版本升级到 15.x 版本。 ## 开始之前 -1. 首先确保你 `Node.js` >= `14.15.0` 或 >= `16.10.0` +1. 首先确保你 `Node.js` >= `14.20.0` 或 >= `16.13.0` 或 >= `18.10.0` 2. 创建新的分支，或者使用其他方式备份当前项目 3. 删除项目下 package-lock.json 文件 @@ -16,7 +16,7 @@ toc: false ### 1. 升级相关依赖 -- 前往 [https://update.angular.io/](https://update.angular.io/) 将项目升级到 Angular 14 +- 前往 [https://update.angular.io/](https://update.angular.io/) 将项目升级到 Angular 15 - 如果你有单独使用 `@angular/cdk` 请执行 `ng update @angular/cdk` ### 升级 NG-ZORRO diff --git a/package.json b/package.json index 4425ca0e9..998bd50bf 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "cron-parser": "^4.6.0", "d3": "^6.3.1", "dagre": "^0.8.5", - "dagre-compound": "0.0.8", + "dagre-compound": "^0.0.8", "detect-port": "^1.3.0", "eslint": "^8.28.0", "eslint-config-prettier": "~8.3.0", diff --git a/scripts/prerender/route-paths.txt b/scripts/prerender/route-paths.txt index 27cebfc3c..dadb80158 100644 --- a/scripts/prerender/route-paths.txt +++ b/scripts/prerender/route-paths.txt @@ -153,8 +153,8 @@ /docs/introduce/zh /docs/join/en /docs/join/zh -/docs/migration-v14/en -/docs/migration-v14/zh +/docs/migration-v15/en +/docs/migration-v15/zh /docs/recommendation/en /docs/recommendation/zh /docs/schematics/en diff --git a/scripts/site/_site/doc/app/header/header.component.ts b/scripts/site/_site/doc/app/header/header.component.ts index fd8053d83..b58d617c9 100644 --- a/scripts/site/_site/doc/app/header/header.component.ts +++ b/scripts/site/_site/doc/app/header/header.component.ts @@ -119,7 +119,19 @@ export class HeaderComponent implements OnChanges { isMobile = false; mode = 'horizontal'; responsive: null | 'narrow' | 'crowded' = null; - oldVersionList = ['13.4.x', '12.1.x', '11.4.x', '10.2.x', '9.3.x', '8.5.x', '7.5.x', '1.8.x', '0.7.x', '0.5.x']; + oldVersionList = [ + '14.3.x', + '13.4.x', + '12.1.x', + '11.4.x', + '10.2.x', + '9.3.x', + '8.5.x', + '7.5.x', + '1.8.x', + '0.7.x', + '0.5.x' + ]; currentVersion = VERSION.full; nextDirection: 'ltr' | 'rtl' = 'rtl'; diff --git a/scripts/site/_site/doc/app/online-ide/files/angular.json.ts b/scripts/site/_site/doc/app/online-ide/files/angular.json.ts index 1949d6d37..8d660b161 100644 --- a/scripts/site/_site/doc/app/online-ide/files/angular.json.ts +++ b/scripts/site/_site/doc/app/online-ide/files/angular.json.ts @@ -17,10 +17,20 @@ export default { main: 'src/main.ts', polyfills: 'src/polyfills.ts', tsConfig: 'src/tsconfig.app.json', - assets: ['src/favicon.ico', 'src/assets'], + assets: [ + 'src/favicon.ico', + 'src/assets', + { + glob: '**/*', + input: 'node_modules/monaco-editor/min/vs', + output: 'assets/vs' + } + ], styles: [ 'node_modules/ng-zorro-antd/src/ng-zorro-antd.min.css', 'node_modules/ng-zorro-antd/resizable/style/index.min.css', + 'node_modules/ng-zorro-antd/code-editor/style/index.min.css', + 'node_modules/ng-zorro-antd/graph/style/index.min.css', 'src/styles.css' ] } diff --git a/scripts/site/_site/doc/app/online-ide/files/ng-zorro-antd.module.ts b/scripts/site/_site/doc/app/online-ide/files/ng-zorro-antd.module.ts index fc3ef76b1..b02c54b9e 100644 --- a/scripts/site/_site/doc/app/online-ide/files/ng-zorro-antd.module.ts +++ b/scripts/site/_site/doc/app/online-ide/files/ng-zorro-antd.module.ts @@ -52,6 +52,7 @@ import { NzSegmentedModule } from 'ng-zorro-antd/segmented'; import { NzSelectModule } from 'ng-zorro-antd/select'; import { NzSkeletonModule } from 'ng-zorro-antd/skeleton'; import { NzSliderModule } from 'ng-zorro-antd/slider'; +import { NzSpaceModule } from 'ng-zorro-antd/space'; import { NzSpinModule } from 'ng-zorro-antd/spin'; import { NzStatisticModule } from 'ng-zorro-antd/statistic'; import { NzStepsModule } from 'ng-zorro-antd/steps'; @@ -72,6 +73,7 @@ import { NzResizableModule } from 'ng-zorro-antd/resizable'; import { NzPipesModule } from 'ng-zorro-antd/pipes'; import { NzCodeEditorModule } from 'ng-zorro-antd/code-editor'; import { NzGraphModule } from 'ng-zorro-antd/graph'; +import { NzCronExpressionModule } from 'ng-zorro-antd/cron-expression'; @NgModule({ exports: [ @@ -91,6 +93,7 @@ import { NzGraphModule } from 'ng-zorro-antd/graph'; NzCheckboxModule, NzCollapseModule, NzCommentModule, + NzCronExpressionModule, NzDatePickerModule, NzDescriptionsModule, NzDividerModule, @@ -124,6 +127,7 @@ import { NzGraphModule } from 'ng-zorro-antd/graph'; NzSelectModule, NzSkeletonModule, NzSliderModule, + NzSpaceModule, NzSpinModule, NzStatisticModule, NzStepsModule, diff --git a/scripts/site/_site/doc/app/online-ide/online-ide.service.ts b/scripts/site/_site/doc/app/online-ide/online-ide.service.ts index cb4103cba..750c90661 100644 --- a/scripts/site/_site/doc/app/online-ide/online-ide.service.ts +++ b/scripts/site/_site/doc/app/online-ide/online-ide.service.ts @@ -19,22 +19,28 @@ export class OnlineIdeService { document: Document; template = 'angular-cli' as const; dependencies = { - '@angular/animations': '^14.1.0', - '@angular/cdk': '^14.1.0', - '@angular/common': '^14.1.0', - '@angular/compiler': '^14.1.0', - '@angular/core': '^14.1.0', - '@angular/forms': '^14.1.0', - '@angular/platform-browser': '^14.1.0', - '@angular/platform-browser-dynamic': '^14.1.0', - '@angular/router': '^14.1.0', - '@ant-design/icons-angular': '^14.1.0', + '@angular/animations': '^15.0.0', + '@angular/cdk': '^15.0.0', + '@angular/common': '^15.0.0', + '@angular/compiler': '^15.0.0', + '@angular/core': '^15.0.0', + '@angular/forms': '^15.0.0', + '@angular/platform-browser': '^15.0.0', + '@angular/platform-browser-dynamic': '^15.0.0', + '@angular/router': '^15.0.0', + '@ant-design/icons-angular': '^15.0.0', rxjs: '~6.6.3', 'core-js': '~3.6.5', 'date-fns': '^2.16.1', tslib: '^2.0.0', 'zone.js': '~0.11.1', - 'ng-zorro-antd': `^${VERSION.full}` + 'ng-zorro-antd': `^${VERSION.full}`, + // demo needs + d3: '^6.3.1', + dagre: '^0.8.5', + 'dagre-compound': '^0.0.8', + 'cron-parser': '^4.6.0', + 'monaco-editor': '^0.33.0' }; // tslint:disable-next-line:no-any