From 133193009572c2c57f07847d19edd61f3a04f987 Mon Sep 17 00:00:00 2001 From: cipchk Date: Mon, 1 Jul 2024 23:47:33 +0800 Subject: [PATCH 1/6] docs: release 18 --- CHANGELOG.md | 158 ------------------ docs/upgrade-v17.en-US.md | 52 ------ docs/upgrade-v17.zh-CN.md | 53 ------ docs/upgrade-v18.en-US.md | 23 +++ docs/upgrade-v18.zh-CN.md | 24 +++ .../ng-update/upgrade-rules/V18/index.ts | 4 - scripts/site/route-paths.txt | 4 +- src/assets/yarn.lock.txt | 96 ++++++----- yarn.lock | 96 ++++++----- 9 files changed, 155 insertions(+), 355 deletions(-) delete mode 100644 docs/upgrade-v17.en-US.md delete mode 100644 docs/upgrade-v17.zh-CN.md create mode 100644 docs/upgrade-v18.en-US.md create mode 100644 docs/upgrade-v18.zh-CN.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 372ee660f..e69de29bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,158 +0,0 @@ -## [17.3.1](https://github.com/ng-alain/delon/compare/17.3.0...17.3.1) (2024-03-18) - - -### Bug Fixes - -* **abc:cell:** fix can't change detection of widget ([#1787](https://github.com/ng-alain/delon/issues/1787)) ([e9753cb](https://github.com/ng-alain/delon/commit/e9753cb43c392a5807319813c4db501701a72dc3)) -* **abc:st:** fix resizeable will trigger sorting or filter ([#1788](https://github.com/ng-alain/delon/issues/1788)) ([7939034](https://github.com/ng-alain/delon/commit/79390340d50d7ce5fb7698857be574df663b250b)) -* **cli:** add `./` current fold in `startup.service` ([#1780](https://github.com/ng-alain/delon/issues/1780)) ([905014b](https://github.com/ng-alain/delon/commit/905014bd09994b784dc467ae2884a1a3e99875de)) -* **theme:** correct `.no-data` text color in dark ([#1782](https://github.com/ng-alain/delon/issues/1782)) ([c74c639](https://github.com/ng-alain/delon/commit/c74c6395bb96b59a15e480736c133889c911f709)) - - - -# [17.3.0](https://github.com/ng-alain/delon/compare/17.2.0...17.3.0) (2024-03-13) - - -### Bug Fixes - -* **abc:reuse-tab:** fix can't cache when component is not used ([#1769](https://github.com/ng-alain/delon/issues/1769)) ([4cb939b](https://github.com/ng-alain/delon/commit/4cb939b390967262584f1ca50623f764fe98fa7f)) -* **abc:st:** fix sorting trigger misalignment in mulit-column ([#1767](https://github.com/ng-alain/delon/issues/1767)) ([4e9aab8](https://github.com/ng-alain/delon/commit/4e9aab89105df1f01061c51acfc921e06270c772)) -* update theme/package.json to depend on @delon/abc and @delon/form ([#1766](https://github.com/ng-alain/delon/issues/1766)) ([b7ea5ac](https://github.com/ng-alain/delon/commit/b7ea5ac9d08d97bec9609f6a4572213ba79116a8)) - -### Features - -* **auth:** ignore all local resource ([#1775](https://github.com/ng-alain/delon/issues/1775)) ([cd8641e](https://github.com/ng-alain/delon/commit/cd8641e5902e1eedd78053591e84320426502be9)) - -### Breaking Changes - -* **abc:cell** widget `data` type changed to `CellTextResult` ([#1771](https://github.com/ng-alain/delon/issues/1771)) ([920b5ab](https://github.com/ng-alain/delon/commit/920b5abc240761a2248feaa45d8f2fd046177f19)) - - - -# [17.2.0](https://github.com/ng-alain/delon/compare/17.1.0...17.2.0) (2024-02-02) - - -### Bug Fixes - -* fix scrollbar thumb color default is transparent ([#1761](https://github.com/ng-alain/delon/issues/1761)) ([6861343](https://github.com/ng-alain/delon/commit/6861343bbe3219dd588cb7ffc062984fa8a3a64e)) -* **form:widget:array:** fix error remove notify ([#1758](https://github.com/ng-alain/delon/issues/1758)) ([4957399](https://github.com/ng-alain/delon/commit/49573999a63796a93a63eae63f392ff4da994e3d)) - - -### Features - -* **abc:st:** add `trackBy` property ([#1760](https://github.com/ng-alain/delon/issues/1760)) ([f4b2fec](https://github.com/ng-alain/delon/commit/f4b2feca272139ad70b7814e3ce5f407e07ef931)) -* **cache:** add `CacheInterceptor` ([#1576](https://github.com/ng-alain/delon/issues/1576)) ([837f4f0](https://github.com/ng-alain/delon/commit/837f4f0f7ac90da9912be8c6b3a1d7aa0c22b220)) - - - -# [17.1.0](https://github.com/ng-alain/delon/compare/17.0.5...17.1.0) (2024-01-20) - - -### Bug Fixes - -* **abc:reuse-tab:** fix keep open order ([#1743](https://github.com/ng-alain/delon/issues/1743)) ([e17f5e7](https://github.com/ng-alain/delon/commit/e17f5e7813ff1da26ce4bada81c5b098bc190b8c)) -* **abc:st:** corrected error null value syntax ([#1744](https://github.com/ng-alain/delon/issues/1744)) ([69bb0bb](https://github.com/ng-alain/delon/commit/69bb0bb432b100cf8a6c5ec87e0fd28dd2923d7d)) - - -### Features - -* add Vietnamese locate ([#1751](https://github.com/ng-alain/delon/issues/1751)) ([385dc1c](https://github.com/ng-alain/delon/commit/385dc1c716327e899f5e61d9823c3deba26ee4bf)) -* **cli:** add `withViewTransitions` ([#1736](https://github.com/ng-alain/delon/issues/1736)) ([c03a797](https://github.com/ng-alain/delon/commit/c03a797c9fb2405acb8455e9c236f23296577c0e)) -* **form:** add `setDisabled`, `setRequired` method ([#1733](https://github.com/ng-alain/delon/issues/1733)) ([581f197](https://github.com/ng-alain/delon/commit/581f197be67e33189aee44b31465fb8b6d21c640)) -* **theme:layout-default:** add `hideEmptyChildren` ([#1746](https://github.com/ng-alain/delon/issues/1746)) ([b6ab5f0](https://github.com/ng-alain/delon/commit/b6ab5f01c18d1668989925377da84b467aa8ee27)) - - -### Performance Improvements - -* **abc:auto-focus:** perf code ([#1753](https://github.com/ng-alain/delon/issues/1753)) ([7032139](https://github.com/ng-alain/delon/commit/7032139472381e5f4619dc0b71c31e43a986965b)) -* **auth:** remove default value of `ignores` ([#1745](https://github.com/ng-alain/delon/issues/1745)) ([e473ff4](https://github.com/ng-alain/delon/commit/e473ff4efc4299a7f2cb2e96dd44fdefedae8e82)) -* support standalone ([#1750](https://github.com/ng-alain/delon/issues/1750)) ([7940464](https://github.com/ng-alain/delon/commit/7940464f69f93f3a1c3013a916d29f73146516d9)) - - - -## 17.0.5 (2023-12-25) - -* ci: add `ng-less-javascript-enabled-patch` (#1739) ([35acf68](https://github.com/ng-alain/delon/commit/35acf68)), closes [#1739](https://github.com/ng-alain/delon/issues/1739) -* fix(abc:st): fix export mismatch (#1740) ([a46f2ee](https://github.com/ng-alain/delon/commit/a46f2ee)), closes [#1740](https://github.com/ng-alain/delon/issues/1740) -* fix(form:array): fix invalid trackBy (#1741) ([3e55228](https://github.com/ng-alain/delon/commit/3e55228)), closes [#1741](https://github.com/ng-alain/delon/issues/1741) - - - -## 17.0.4 (2023-12-20) - -* fix(abc:se): fix missing required of reactive (#1737) ([a2ca109](https://github.com/ng-alain/delon/commit/a2ca109)), closes [#1737](https://github.com/ng-alain/delon/issues/1737) -* fix(abc:sv): fix bottom spacing in border mode (#1732) ([b5bea4e](https://github.com/ng-alain/delon/commit/b5bea4e)), closes [#1732](https://github.com/ng-alain/delon/issues/1732) -* fix(util:pipe:filter): use `pure` (#1735) ([f374209](https://github.com/ng-alain/delon/commit/f374209)), closes [#1735](https://github.com/ng-alain/delon/issues/1735) -* fix(cli): correct 'providers' spelling errors (#1731) ([5eafa8f](https://github.com/ng-alain/delon/commit/5eafa8f)), closes [#1731](https://github.com/ng-alain/delon/issues/1731) -* chore: remove sandbox (#1730) ([1869b59](https://github.com/ng-alain/delon/commit/1869b59)), closes [#1730](https://github.com/ng-alain/delon/issues/1730) -* ci: save yarn.lock to assets (#1729) ([33a4952](https://github.com/ng-alain/delon/commit/33a4952)), closes [#1729](https://github.com/ng-alain/delon/issues/1729) -* docs: sc of demo (#1728) ([3fc0180](https://github.com/ng-alain/delon/commit/3fc0180)), closes [#1728](https://github.com/ng-alain/delon/issues/1728) - - - -## 17.0.3 (2023-12-08) - -* fix(theme:i18n): correct params type of `i18e` pipe (#1723) ([bdf0e62](https://github.com/ng-alain/delon/commit/bdf0e62)), closes [#1723](https://github.com/ng-alain/delon/issues/1723) -* fix(cli): correct null value handling (#1724) ([c88c9f2](https://github.com/ng-alain/delon/commit/c88c9f2)), closes [#1724](https://github.com/ng-alain/delon/issues/1724) - - -## 17.0.2 (2023-11-27) - -* fix(cli): fix cannot find module `@angular/cdk/schematics` (#1721) ([49a84a1](https://github.com/ng-alain/delon/commit/49a84a1)), closes [#1721](https://github.com/ng-alain/delon/issues/1721) - - - -## 17.0.1 (2023-11-26) - -* fix(cli): fix node version (#1719) ([df40bb3](https://github.com/ng-alain/delon/commit/df40bb3)), closes [#1719](https://github.com/ng-alain/delon/issues/1719) - - - -## 17.0.0 (2023-11-26) - -* chore: add `typescript.referencesCodeLens.enabled` (#1679) ([4d2d25c](https://github.com/ng-alain/delon/commit/4d2d25c)), closes [#1679](https://github.com/ng-alain/delon/issues/1679) -* chore: add data theme (#1684) ([d364ec1](https://github.com/ng-alain/delon/commit/d364ec1)), closes [#1684](https://github.com/ng-alain/delon/issues/1684) -* chore: bump zorro 17.0.1 (#1712) ([4d9f353](https://github.com/ng-alain/delon/commit/4d9f353)), closes [#1712](https://github.com/ng-alain/delon/issues/1712) -* chore: fix `provideMockConfig` (#1703) ([ae1cc30](https://github.com/ng-alain/delon/commit/ae1cc30)), closes [#1703](https://github.com/ng-alain/delon/issues/1703) -* chore: fix interceptor (#1710) ([54f4ea3](https://github.com/ng-alain/delon/commit/54f4ea3)), closes [#1710](https://github.com/ng-alain/delon/issues/1710) -* chore: fix ngDevMode (#1685) ([2803dc8](https://github.com/ng-alain/delon/commit/2803dc8)), closes [#1685](https://github.com/ng-alain/delon/issues/1685) -* chore: perf mock interceptor (#1713) ([fa4dc94](https://github.com/ng-alain/delon/commit/fa4dc94)), closes [#1713](https://github.com/ng-alain/delon/issues/1713) -* chore: remove Hotjar script (#1683) ([66e612d](https://github.com/ng-alain/delon/commit/66e612d)), closes [#1683](https://github.com/ng-alain/delon/issues/1683) -* chore: support standalone of site (#1696) ([1dce440](https://github.com/ng-alain/delon/commit/1dce440)), closes [#1696](https://github.com/ng-alain/delon/issues/1696) -* chore: type of widget registry items (#1715) ([7045cec](https://github.com/ng-alain/delon/commit/7045cec)), closes [#1715](https://github.com/ng-alain/delon/issues/1715) -* chore(cli): fix `ng update` (#1714) ([a6c860e](https://github.com/ng-alain/delon/commit/a6c860e)), closes [#1714](https://github.com/ng-alain/delon/issues/1714) -* chore(theme): add defaultLang (#1705) ([dbc122e](https://github.com/ng-alain/delon/commit/dbc122e)), closes [#1705](https://github.com/ng-alain/delon/issues/1705) -* chore(theme): add icon (#1706) ([fcbb0a7](https://github.com/ng-alain/delon/commit/fcbb0a7)), closes [#1706](https://github.com/ng-alain/delon/issues/1706) -* docs: unified NG-ALAIN text mark (#1677) ([491a342](https://github.com/ng-alain/delon/commit/491a342)), closes [#1677](https://github.com/ng-alain/delon/issues/1677) -* docs: upgrade angualr 17 (#1717) ([0b423c5](https://github.com/ng-alain/delon/commit/0b423c5)), closes [#1717](https://github.com/ng-alain/delon/issues/1717) -* perf: add `provideDelonMockConfig` (#1695) ([683ab23](https://github.com/ng-alain/delon/commit/683ab23)), closes [#1695](https://github.com/ng-alain/delon/issues/1695) -* perf(*): support standalone (#1694) ([d6e75a0](https://github.com/ng-alain/delon/commit/d6e75a0)), closes [#1694](https://github.com/ng-alain/delon/issues/1694) -* perf(*): use control flow (#1716) ([bee524f](https://github.com/ng-alain/delon/commit/bee524f)), closes [#1716](https://github.com/ng-alain/delon/issues/1716) -* perf(theme): remove forRoot and forChild (#1688) ([d1ed91e](https://github.com/ng-alain/delon/commit/d1ed91e)), closes [#1688](https://github.com/ng-alain/delon/issues/1688) -* chore(theme:preloader): support ssr (#1699) ([501566b](https://github.com/ng-alain/delon/commit/501566b)), closes [#1699](https://github.com/ng-alain/delon/issues/1699) -* feat(abc:cell): add `provideCellWidgets` (#1700) ([7ea0daf](https://github.com/ng-alain/delon/commit/7ea0daf)), closes [#1700](https://github.com/ng-alain/delon/issues/1700) -* feat(abc:reuse-tab): add provide (#1707) ([2f85357](https://github.com/ng-alain/delon/commit/2f85357)), closes [#1707](https://github.com/ng-alain/delon/issues/1707) -* feat(abc:st): add `provideSTWidgets` (#1701) ([065316a](https://github.com/ng-alain/delon/commit/065316a)), closes [#1701](https://github.com/ng-alain/delon/issues/1701) -* feat(theme:_httpclient): add `timestampSecond` (#1670) ([051b087](https://github.com/ng-alain/delon/commit/051b087)), closes [#1670](https://github.com/ng-alain/delon/issues/1670) -* feat(theme:pipe:date): add global config (#1711) ([b3b93fa](https://github.com/ng-alain/delon/commit/b3b93fa)), closes [#1711](https://github.com/ng-alain/delon/issues/1711) -* perf(cli:update): automatically add @_mock path (#1675) ([d014b54](https://github.com/ng-alain/delon/commit/d014b54)), closes [#1675](https://github.com/ng-alain/delon/issues/1675) -* perf(theme:preloader): fix loading order issues (#1691) ([f09c324](https://github.com/ng-alain/delon/commit/f09c324)), closes [#1691](https://github.com/ng-alain/delon/issues/1691) -* style(*): `clean` instead of `rational` of style (#1674) ([d9ea22f](https://github.com/ng-alain/delon/commit/d9ea22f)), closes [#1674](https://github.com/ng-alain/delon/issues/1674) -* style(*): bump prettier to `3.1.0` (#1708) ([7f9e861](https://github.com/ng-alain/delon/commit/7f9e861)), closes [#1708](https://github.com/ng-alain/delon/issues/1708) -* style(cli): fix prefer-self-closing-tags error (#1709) ([1abe2d5](https://github.com/ng-alain/delon/commit/1abe2d5)), closes [#1709](https://github.com/ng-alain/delon/issues/1709) -* feat: add `provideAlainConfig` (#1689) ([b9e0fad](https://github.com/ng-alain/delon/commit/b9e0fad)), closes [#1689](https://github.com/ng-alain/delon/issues/1689) -* feat(acl): remove `forRoot` (#1690) ([4472d48](https://github.com/ng-alain/delon/commit/4472d48)), closes [#1690](https://github.com/ng-alain/delon/issues/1690) -* feat(auth): add provide (#1704) ([c0c731b](https://github.com/ng-alain/delon/commit/c0c731b)), closes [#1704](https://github.com/ng-alain/delon/issues/1704) -* feat(cli): support multiple projects (#1664) ([e5476e2](https://github.com/ng-alain/delon/commit/e5476e2)), closes [#1664](https://github.com/ng-alain/delon/issues/1664) -* feat(form): add `provideSFConfig` (#1702) ([2404802](https://github.com/ng-alain/delon/commit/2404802)), closes [#1702](https://github.com/ng-alain/delon/issues/1702) -* feat(mock): add `mockInterceptor` (#1698) ([da051b2](https://github.com/ng-alain/delon/commit/da051b2)), closes [#1698](https://github.com/ng-alain/delon/issues/1698) -* feat(mock): support asynchronous of response (#1686) ([d7980db](https://github.com/ng-alain/delon/commit/d7980db)), closes [#1686](https://github.com/ng-alain/delon/issues/1686) -* feat(testing): add `delay` function (#1682) ([f83ea57](https://github.com/ng-alain/delon/commit/f83ea57)), closes [#1682](https://github.com/ng-alain/delon/issues/1682) -* feat(theme): add `provideAlain` (#1697) ([4311426](https://github.com/ng-alain/delon/commit/4311426)), closes [#1697](https://github.com/ng-alain/delon/issues/1697) -* fix(theme): corrected menu can't scrolling (#1692) ([2993297](https://github.com/ng-alain/delon/commit/2993297)), closes [#1692](https://github.com/ng-alain/delon/issues/1692) -* build: remove `networkEnv` plugin instead of `nnrm` (#1680) ([b7dbc68](https://github.com/ng-alain/delon/commit/b7dbc68)), closes [#1680](https://github.com/ng-alain/delon/issues/1680) -* build: support pnpm and update yarn to `4` (#1678) ([b904b9a](https://github.com/ng-alain/delon/commit/b904b9a)), closes [#1678](https://github.com/ng-alain/delon/issues/1678) -* build: update angualr 17 (#1687) ([a8fc961](https://github.com/ng-alain/delon/commit/a8fc961)), closes [#1687](https://github.com/ng-alain/delon/issues/1687) -* refactor(form): refining low-frequency widgets (#1668) ([8ab0e82](https://github.com/ng-alain/delon/commit/8ab0e82)), closes [#1668](https://github.com/ng-alain/delon/issues/1668) -* ci: update node version (#1681) ([acae2c3](https://github.com/ng-alain/delon/commit/acae2c3)), closes [#1681](https://github.com/ng-alain/delon/issues/1681) - diff --git a/docs/upgrade-v17.en-US.md b/docs/upgrade-v17.en-US.md deleted file mode 100644 index 5b2c28a9c..000000000 --- a/docs/upgrade-v17.en-US.md +++ /dev/null @@ -1,52 +0,0 @@ ---- -order: 1000 -type: Basic -title: Upgrade to version 17.0 -hot: true ---- - -> This guide applies to the current version ng-alain >= `16`; -> If you encounter problems during the upgrade process, feel free to comment here. -> If you find any errors in this guide, please point out -> Or you have encountered a new problem and solved it, welcome to comment here. - - -## Before upgrade - -1. Make sure `Node.js` >= `18.13.0`. -2. Create a new branch, or use other methods to back up the current project. -3. Delete the `package-lock.json` or `yarn.lock` file. - -### 1.Upgrade dependencies - -- Upgrade Angular to 16.x version, Run `ng update @angular/core@17 @angular/cli@17 @angular-eslint/schematics@17 ng-zorro-antd@17 ng-alain@17`. -- _Run `ng update @angular/cdk@17`, if you have used `@angular/cdk`._ -- **If any warning messages appear in the console, follow the prompts to modify the corresponding code.** - -> NG-ALAIN scaffolding upgrade all change files, please refer to: [#2394](https://github.com/ng-alain/ng-alain/pull/2394/files). - -## Optional - -The optional part of the work is centered around Standalone. Currently, NG-ALAIN will reserve some DEMO pages using the NgModule writing method. [#2442](https://github.com/ng-alain/ng-alain/pull/2442/files) contains all changes in this PR. - -### Upgrade to Standalone - -- Use `bootstrapApplication` instead of `platformBrowserDynamic` -- Use `app.config.ts` instead of `global-config.module.ts`, `app.module.ts` - -The `layout`, `dashboard`, `passport` have been rewritten using standalone and can be modified according to [#2442](https://github.com/ng-alain/ng-alain/pull/2442/files) changes. - -### DI configuration - -- NG-ALAIN removes all DI configuration modes such as `Module. forRoot`. Of course, for compatibility, the `NgModule` writing method is still retained. -- All DI configurations are maintained by `provide*`, see `app.config.ts` for more details -- If you use a third party but does not provide a similar `provide` writing method, you need to transition through `importProvidersFrom` - -### HTTP interceptor - -- Angular 17 has strict requirements for the order of interceptors to be visible. This upgrade has all been modified to the `HttpInterceptorFn` writing method (see `provideHttpClient` for details) -- If you upgrade from NG-ALAIN 16, `withInterceptorsFromDi()` will be imported by default to be compatible with the `HTTP_INTERCEPTORS` writing method, but it is recommended to upgrade to the new writing method as much as possible, please refer to [#2442](https://github.com/ng-alain/ng-alain/pull/2442/files) - -### About `@delon/form` - -- Convert all widgets with low frequency into optional imports. All widgets will be automatically imported during this upgrade to ensure compatibility. diff --git a/docs/upgrade-v17.zh-CN.md b/docs/upgrade-v17.zh-CN.md deleted file mode 100644 index 3a049cca0..000000000 --- a/docs/upgrade-v17.zh-CN.md +++ /dev/null @@ -1,53 +0,0 @@ ---- -order: 1000 -type: Basic -title: 升级到 17.0 版本 -hot: true ---- - -> 本指南适用于当前版本 ng-alain >= `16` ; -> 如果在升级过程中遇到问题，欢迎提出。提问前请阅读 [如何向开源社区提问题](https://github.com/seajs/seajs/issues/545) -> 如果发现本指南存在遗漏/错误，请指出! -> 或者你遇到了新的问题并解决了，欢迎补充! - -## 开始之前 - -1. 首先确保你 `Node.js` >= `18.13.0` -2. 创建新的分支，或者使用其他方式备份当前项目 -3. 删除项目下 `package-lock.json` 或 `yarn.lock` 文件 - -## 升级步骤 - -### 升级相关依赖 - -- 将项目升级到 Angular 16 运行 `ng update @angular/core@17 @angular/cli@17 @angular-eslint/schematics@17 ng-zorro-antd@17 ng-alain@17`。 -- _如果你有单独使用 `@angular/cdk` 请执行 `ng update @angular/cdk@17`_ -- **如果控制台出现警告消息请按提示修改对应代码** - -> NG-ALAIN脚手架升级全部变更文件，请参考：[#2394](https://github.com/ng-alain/ng-alain/pull/2394/files)。 - -## 可选部分 - -可选部分的主要工作都是围绕 Standalone 展开，目前 NG-ALAIN 会保留部分DEMO页使用 NgModule 写法。[#2442](https://github.com/ng-alain/ng-alain/pull/2442/files) 包含着这部分变动的所有内容。 - -### 升级为 Standalone - -- 使用 `bootstrapApplication` 替代 `platformBrowserDynamic` -- 使用 `app.config.ts` 替代 `global-config.module.ts`, `app.module.ts` - -其中 `layout`, `dashboard`, `passport` 目录采用 standalone 写法，可根据 [#2442](https://github.com/ng-alain/ng-alain/pull/2442/files) 变动自行修改。 - -### DI配置 - -- NG-ALAIN 移除掉所有 `Module. forRoot` 之类的 DI 配置模式，当然为了兼容，依然保留 `NgModule` 写法 -- 所有DI配置都是 `provide*` 来维护，更多细节见 `app.config.ts` -- 如果您使用第三方但不提供类似 `provide` 写法时，只需要借助 `importProvidersFrom` 过渡 - -### HTTP拦截器 - -- Angular 17 对拦截器顺序可见有严格的要求，本次升级已经全部修改为 `HttpInterceptorFn` 写法（细节见 `provideHttpClient`） -- 若从 NG-ALAIN 16 升级默认为会导入 `withInterceptorsFromDi()` 用于兼容 `HTTP_INTERCEPTORS` 写法，但建议尽可能升级新的写法，可参考 [#2442](https://github.com/ng-alain/ng-alain/pull/2442/files) - -### 关于 `@delon/form` - -- 将小部件频率较低的全部转化为可选导入，本次升级时会自动导入所有小部件来保证兼容 diff --git a/docs/upgrade-v18.en-US.md b/docs/upgrade-v18.en-US.md new file mode 100644 index 000000000..66fa5f52d --- /dev/null +++ b/docs/upgrade-v18.en-US.md @@ -0,0 +1,23 @@ +--- +order: 1000 +type: Basic +title: Upgrade to version 18.0 +hot: true +--- + +> This guide applies to the current version ng-alain >= `17`; +> If you encounter problems during the upgrade process, feel free to comment here. +> If you find any errors in this guide, please point out +> Or you have encountered a new problem and solved it, welcome to comment here. + + +## Before upgrade + +1. Make sure `Node.js` >= `18.19.1`. +2. Create a new branch, or use other methods to back up the current project. +3. Delete the `package-lock.json` or `yarn.lock` file. + +### 1.Upgrade dependencies + +- Upgrade Angular to 17.x version, Run `ng update @angular/core@18 @angular/cli@18 @angular-eslint/schematics@18 ng-zorro-antd@18 ng-alain@18`. +- _Run `ng update @angular/cdk@18`, if you have used `@angular/cdk`._ diff --git a/docs/upgrade-v18.zh-CN.md b/docs/upgrade-v18.zh-CN.md new file mode 100644 index 000000000..e6dd3b76e --- /dev/null +++ b/docs/upgrade-v18.zh-CN.md @@ -0,0 +1,24 @@ +--- +order: 1000 +type: Basic +title: 升级到 18.0 版本 +hot: true +--- + +> 本指南适用于当前版本 ng-alain >= `17` ; +> 如果在升级过程中遇到问题，欢迎提出。提问前请阅读 [如何向开源社区提问题](https://github.com/seajs/seajs/issues/545) +> 如果发现本指南存在遗漏/错误，请指出! +> 或者你遇到了新的问题并解决了，欢迎补充! + +## 开始之前 + +1. 首先确保你 `Node.js` >= `18.19.1` +2. 创建新的分支，或者使用其他方式备份当前项目 +3. 删除项目下 `package-lock.json` 或 `yarn.lock` 文件 + +## 升级步骤 + +### 升级相关依赖 + +- 将项目升级到 Angular 17 运行 `ng update @angular/core@18 @angular/cli@18 @angular-eslint/schematics@18 ng-zorro-antd@18 ng-alain@18`。 +- _如果你有单独使用 `@angular/cdk` 请执行 `ng update @angular/cdk@18`_ diff --git a/schematics/ng-update/upgrade-rules/V18/index.ts b/schematics/ng-update/upgrade-rules/V18/index.ts index 5b8c4a410..99746d5b0 100644 --- a/schematics/ng-update/upgrade-rules/V18/index.ts +++ b/schematics/ng-update/upgrade-rules/V18/index.ts @@ -9,10 +9,6 @@ function finished(): Rule { return (_tree: Tree, context: SchematicContext) => { context.addTask(new NodePackageInstallTask()); - logWarn(context, `Please check the modified files. Some upgrades may have incorrect formats or missing imports.`); - logWarn(context, `Please check the modified files. Some upgrades may have incorrect formats or missing imports.`); - logWarn(context, `Please check the modified files. Some upgrades may have incorrect formats or missing imports.`); - logFinished( context, `Congratulations, Abort more detail please refer to upgrade guide https://github.com/ng-alain/ng-alain/issues/2502` diff --git a/scripts/site/route-paths.txt b/scripts/site/route-paths.txt index 001a23c6b..cefb45317 100644 --- a/scripts/site/route-paths.txt +++ b/scripts/site/route-paths.txt @@ -187,8 +187,8 @@ /docs/style-guide/zh /docs/theme/en /docs/theme/zh -/docs/upgrade-v17/en -/docs/upgrade-v17/zh +/docs/upgrade-v18/en +/docs/upgrade-v18/zh /docs/upgrade/en /docs/upgrade/zh /form/acl/en diff --git a/src/assets/yarn.lock.txt b/src/assets/yarn.lock.txt index 82f70fc6f..20e162d9a 100644 --- a/src/assets/yarn.lock.txt +++ b/src/assets/yarn.lock.txt @@ -184,61 +184,61 @@ __metadata: linkType: hard "@angular-eslint/builder@npm:^18.0.1": - version: 18.0.1 - resolution: "@angular-eslint/builder@npm:18.0.1" + version: 18.1.0 + resolution: "@angular-eslint/builder@npm:18.1.0" dependencies: "@nx/devkit": "npm:^19.0.6" nx: "npm:^19.0.6" peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: "*" - checksum: 211176ccf258fde2f2202436222657ee71f8376bdef5e4abe18005e057472d08de52630b59a368d79c4d742f2358fdf0956658526a22923f93f76bd334fad4bf + checksum: e23ccbf29bf4d57ca2afa933cdddde7031c82e1383c37e7fba739725816696c5e9ef996284d6b75cc2a053d09ea0d6bb4a398580adf8a10820f9cf9e1a87ef33 languageName: node linkType: hard -"@angular-eslint/bundled-angular-compiler@npm:18.0.1": - version: 18.0.1 - resolution: "@angular-eslint/bundled-angular-compiler@npm:18.0.1" - checksum: c4d265a565b052fe598b54fd30460f8f579dbd4e7b255e50a9b147af7258e4b2c2d7add41909b12c8e9b0f95e8eb70dd4e714284b99f5952d0e23a05b14e7bfe +"@angular-eslint/bundled-angular-compiler@npm:18.1.0": + version: 18.1.0 + resolution: "@angular-eslint/bundled-angular-compiler@npm:18.1.0" + checksum: 0ceffce34a1940a55ffced811c3937c799f12f787c092a9d69b9656a7ea8ce7f533416ea73b9dad840547eb8d11d0d4e742d3504e61d8e459fbe426af99bd9b8 languageName: node linkType: hard -"@angular-eslint/eslint-plugin-template@npm:18.0.1, @angular-eslint/eslint-plugin-template@npm:^18.0.0": - version: 18.0.1 - resolution: "@angular-eslint/eslint-plugin-template@npm:18.0.1" +"@angular-eslint/eslint-plugin-template@npm:18.1.0, @angular-eslint/eslint-plugin-template@npm:^18.0.0": + version: 18.1.0 + resolution: "@angular-eslint/eslint-plugin-template@npm:18.1.0" dependencies: - "@angular-eslint/bundled-angular-compiler": "npm:18.0.1" - "@angular-eslint/utils": "npm:18.0.1" + "@angular-eslint/bundled-angular-compiler": "npm:18.1.0" + "@angular-eslint/utils": "npm:18.1.0" aria-query: "npm:5.3.0" axobject-query: "npm:4.0.0" peerDependencies: - "@typescript-eslint/utils": ^7.11.0 || ^8.0.0-alpha.20 + "@typescript-eslint/utils": ^7.11.0 || ^8.0.0-alpha.37 eslint: ^8.57.0 || ^9.0.0 typescript: "*" - checksum: a248336f5454703fa5ec6b22a401a538e1dc1d041f24ade148ae0017213c0756f0bb6ae2a02e60fdcecd36c9ac11d313a216667c7c24ada37cb177d4821a562f + checksum: a46457024ed254b7b7ee543fb5c3be5596be29a85a6e997175ea18f4efb7ecd7c9175b217197f2f7518a0e879be78f0b775f50c384840d878ce4647a9e80b5f5 languageName: node linkType: hard -"@angular-eslint/eslint-plugin@npm:18.0.1, @angular-eslint/eslint-plugin@npm:^18.0.0": - version: 18.0.1 - resolution: "@angular-eslint/eslint-plugin@npm:18.0.1" +"@angular-eslint/eslint-plugin@npm:18.1.0, @angular-eslint/eslint-plugin@npm:^18.0.0": + version: 18.1.0 + resolution: "@angular-eslint/eslint-plugin@npm:18.1.0" dependencies: - "@angular-eslint/bundled-angular-compiler": "npm:18.0.1" - "@angular-eslint/utils": "npm:18.0.1" + "@angular-eslint/bundled-angular-compiler": "npm:18.1.0" + "@angular-eslint/utils": "npm:18.1.0" peerDependencies: - "@typescript-eslint/utils": ^7.11.0 || ^8.0.0-alpha.20 + "@typescript-eslint/utils": ^7.11.0 || ^8.0.0-alpha.37 eslint: ^8.57.0 || ^9.0.0 typescript: "*" - checksum: 244ad862e04606db5d76b8568696b398d647fa1a734e752786a1f65122a375aacec03efa49dfb4eb4d339f3ba8f046914777ddb3863a0e4a54dca0842806cf44 + checksum: e943c84399a70e85706ae40f8cce77ad0720e7e70c6e7c752b94afd2ed85a5b36262b64c165672920e72a11a1ef45e09156120941aa5abce9cd8dc315933b75e languageName: node linkType: hard "@angular-eslint/schematics@npm:^18.0.0": - version: 18.0.1 - resolution: "@angular-eslint/schematics@npm:18.0.1" + version: 18.1.0 + resolution: "@angular-eslint/schematics@npm:18.1.0" dependencies: - "@angular-eslint/eslint-plugin": "npm:18.0.1" - "@angular-eslint/eslint-plugin-template": "npm:18.0.1" + "@angular-eslint/eslint-plugin": "npm:18.1.0" + "@angular-eslint/eslint-plugin-template": "npm:18.1.0" "@nx/devkit": "npm:^19.0.6" ignore: "npm:5.3.1" nx: "npm:^19.0.6" @@ -247,33 +247,33 @@ __metadata: peerDependencies: "@angular-devkit/core": ">= 18.0.0 < 19.0.0" "@angular-devkit/schematics": ">= 18.0.0 < 19.0.0" - checksum: bf4f1c6580128bff730cf0b2d931c21b0c1332637b9513dce3cd336ed3e8d58a2df75ef2eb412080d9a2420387e6fc0e7c5510457af633e2cd35c6802c93a029 + checksum: ccc2aa8a1849ec337143293495b0897c7cb399258060b4a4127838fa1835763b9a2b0a19dc6a430a189bf963087324eb416769b2289cd6263da27879141aa990 languageName: node linkType: hard "@angular-eslint/template-parser@npm:^18.0.0": - version: 18.0.1 - resolution: "@angular-eslint/template-parser@npm:18.0.1" + version: 18.1.0 + resolution: "@angular-eslint/template-parser@npm:18.1.0" dependencies: - "@angular-eslint/bundled-angular-compiler": "npm:18.0.1" + "@angular-eslint/bundled-angular-compiler": "npm:18.1.0" eslint-scope: "npm:^8.0.0" peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: "*" - checksum: f3005a8acdd0fcb111af4a9ddd23342e1f3455cf34f827ec00baede23e51d301f3d7ea1d9f908536467db63b286c3ea8ec449a83fa1944b2d6a1f13d2f22cb5b + checksum: 52ecb0b7c9546623aa399aa0a65364f775c818c77f4e35a2a2e507ddba1428a61cea2b0b4dcbac76b00e2b671ba524752c38ebcddf15e097caf6963dfbb82e24 languageName: node linkType: hard -"@angular-eslint/utils@npm:18.0.1": - version: 18.0.1 - resolution: "@angular-eslint/utils@npm:18.0.1" +"@angular-eslint/utils@npm:18.1.0": + version: 18.1.0 + resolution: "@angular-eslint/utils@npm:18.1.0" dependencies: - "@angular-eslint/bundled-angular-compiler": "npm:18.0.1" + "@angular-eslint/bundled-angular-compiler": "npm:18.1.0" peerDependencies: - "@typescript-eslint/utils": ^7.11.0 || ^8.0.0-alpha.20 + "@typescript-eslint/utils": ^7.11.0 || ^8.0.0-alpha.37 eslint: ^8.57.0 || ^9.0.0 typescript: "*" - checksum: 3b283b506a00bae0b62c487866108e6520a24ba13ad00795fa343557765204bd199cc417008cd1ba9825d820ec923ef83e4cbd3bd147f396d5ebaa34d7b505a5 + checksum: 81c7f29bcda7e93bf97f1514aad7ed6583c0a5c093d67e17df491d9cfd2387b21269400d57505ac1b4dc617b6007f655333d1ae98ef2aab6d20fe156db977b2a languageName: node linkType: hard @@ -5873,9 +5873,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001629": - version: 1.0.30001638 - resolution: "caniuse-lite@npm:1.0.30001638" - checksum: 33019e0c53ed73f1e728b6f313efed2d7a25710dfa2ad3924d2be9939df10d0991556ac87523d3177d472c246654c9216f03e5532717ed97df58014728c3e798 + version: 1.0.30001639 + resolution: "caniuse-lite@npm:1.0.30001639" + checksum: 3f56ce3d516a4fba959ad10ed6ecb15c6329233fc01f9f2714234a2ca91f408296d708a366ece510ca6566f71cb80d20d4c019441a1451ac1456e0128c8de78a languageName: node linkType: hard @@ -10367,7 +10367,7 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:7.0.4, https-proxy-agent@npm:^7.0.1": +"https-proxy-agent@npm:7.0.4": version: 7.0.4 resolution: "https-proxy-agent@npm:7.0.4" dependencies: @@ -10397,6 +10397,16 @@ __metadata: languageName: node linkType: hard +"https-proxy-agent@npm:^7.0.1": + version: 7.0.5 + resolution: "https-proxy-agent@npm:7.0.5" + dependencies: + agent-base: "npm:^7.0.2" + debug: "npm:4" + checksum: 2490e3acec397abeb88807db52cac59102d5ed758feee6df6112ab3ccd8325e8a1ce8bce6f4b66e5470eca102d31e425ace904242e4fa28dbe0c59c4bafa7b2c + languageName: node + linkType: hard + "human-signals@npm:^2.1.0": version: 2.1.0 resolution: "human-signals@npm:2.1.0" @@ -16847,13 +16857,13 @@ __metadata: linkType: hard "string-width@npm:^7.0.0": - version: 7.1.0 - resolution: "string-width@npm:7.1.0" + version: 7.2.0 + resolution: "string-width@npm:7.2.0" dependencies: emoji-regex: "npm:^10.3.0" get-east-asian-width: "npm:^1.0.0" strip-ansi: "npm:^7.1.0" - checksum: 68a99fbc3bd3d8eb42886ff38dce819767dee55f606f74dfa4687a07dfd21262745d9683df0aa53bf81a5dd47c13da921a501925b974bec66a7ddd634fef0634 + checksum: eb0430dd43f3199c7a46dcbf7a0b34539c76fe3aa62763d0b0655acdcbdf360b3f66f3d58ca25ba0205f42ea3491fa00f09426d3b7d3040e506878fc7664c9b9 languageName: node linkType: hard diff --git a/yarn.lock b/yarn.lock index 82f70fc6f..20e162d9a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -184,61 +184,61 @@ __metadata: linkType: hard "@angular-eslint/builder@npm:^18.0.1": - version: 18.0.1 - resolution: "@angular-eslint/builder@npm:18.0.1" + version: 18.1.0 + resolution: "@angular-eslint/builder@npm:18.1.0" dependencies: "@nx/devkit": "npm:^19.0.6" nx: "npm:^19.0.6" peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: "*" - checksum: 211176ccf258fde2f2202436222657ee71f8376bdef5e4abe18005e057472d08de52630b59a368d79c4d742f2358fdf0956658526a22923f93f76bd334fad4bf + checksum: e23ccbf29bf4d57ca2afa933cdddde7031c82e1383c37e7fba739725816696c5e9ef996284d6b75cc2a053d09ea0d6bb4a398580adf8a10820f9cf9e1a87ef33 languageName: node linkType: hard -"@angular-eslint/bundled-angular-compiler@npm:18.0.1": - version: 18.0.1 - resolution: "@angular-eslint/bundled-angular-compiler@npm:18.0.1" - checksum: c4d265a565b052fe598b54fd30460f8f579dbd4e7b255e50a9b147af7258e4b2c2d7add41909b12c8e9b0f95e8eb70dd4e714284b99f5952d0e23a05b14e7bfe +"@angular-eslint/bundled-angular-compiler@npm:18.1.0": + version: 18.1.0 + resolution: "@angular-eslint/bundled-angular-compiler@npm:18.1.0" + checksum: 0ceffce34a1940a55ffced811c3937c799f12f787c092a9d69b9656a7ea8ce7f533416ea73b9dad840547eb8d11d0d4e742d3504e61d8e459fbe426af99bd9b8 languageName: node linkType: hard -"@angular-eslint/eslint-plugin-template@npm:18.0.1, @angular-eslint/eslint-plugin-template@npm:^18.0.0": - version: 18.0.1 - resolution: "@angular-eslint/eslint-plugin-template@npm:18.0.1" +"@angular-eslint/eslint-plugin-template@npm:18.1.0, @angular-eslint/eslint-plugin-template@npm:^18.0.0": + version: 18.1.0 + resolution: "@angular-eslint/eslint-plugin-template@npm:18.1.0" dependencies: - "@angular-eslint/bundled-angular-compiler": "npm:18.0.1" - "@angular-eslint/utils": "npm:18.0.1" + "@angular-eslint/bundled-angular-compiler": "npm:18.1.0" + "@angular-eslint/utils": "npm:18.1.0" aria-query: "npm:5.3.0" axobject-query: "npm:4.0.0" peerDependencies: - "@typescript-eslint/utils": ^7.11.0 || ^8.0.0-alpha.20 + "@typescript-eslint/utils": ^7.11.0 || ^8.0.0-alpha.37 eslint: ^8.57.0 || ^9.0.0 typescript: "*" - checksum: a248336f5454703fa5ec6b22a401a538e1dc1d041f24ade148ae0017213c0756f0bb6ae2a02e60fdcecd36c9ac11d313a216667c7c24ada37cb177d4821a562f + checksum: a46457024ed254b7b7ee543fb5c3be5596be29a85a6e997175ea18f4efb7ecd7c9175b217197f2f7518a0e879be78f0b775f50c384840d878ce4647a9e80b5f5 languageName: node linkType: hard -"@angular-eslint/eslint-plugin@npm:18.0.1, @angular-eslint/eslint-plugin@npm:^18.0.0": - version: 18.0.1 - resolution: "@angular-eslint/eslint-plugin@npm:18.0.1" +"@angular-eslint/eslint-plugin@npm:18.1.0, @angular-eslint/eslint-plugin@npm:^18.0.0": + version: 18.1.0 + resolution: "@angular-eslint/eslint-plugin@npm:18.1.0" dependencies: - "@angular-eslint/bundled-angular-compiler": "npm:18.0.1" - "@angular-eslint/utils": "npm:18.0.1" + "@angular-eslint/bundled-angular-compiler": "npm:18.1.0" + "@angular-eslint/utils": "npm:18.1.0" peerDependencies: - "@typescript-eslint/utils": ^7.11.0 || ^8.0.0-alpha.20 + "@typescript-eslint/utils": ^7.11.0 || ^8.0.0-alpha.37 eslint: ^8.57.0 || ^9.0.0 typescript: "*" - checksum: 244ad862e04606db5d76b8568696b398d647fa1a734e752786a1f65122a375aacec03efa49dfb4eb4d339f3ba8f046914777ddb3863a0e4a54dca0842806cf44 + checksum: e943c84399a70e85706ae40f8cce77ad0720e7e70c6e7c752b94afd2ed85a5b36262b64c165672920e72a11a1ef45e09156120941aa5abce9cd8dc315933b75e languageName: node linkType: hard "@angular-eslint/schematics@npm:^18.0.0": - version: 18.0.1 - resolution: "@angular-eslint/schematics@npm:18.0.1" + version: 18.1.0 + resolution: "@angular-eslint/schematics@npm:18.1.0" dependencies: - "@angular-eslint/eslint-plugin": "npm:18.0.1" - "@angular-eslint/eslint-plugin-template": "npm:18.0.1" + "@angular-eslint/eslint-plugin": "npm:18.1.0" + "@angular-eslint/eslint-plugin-template": "npm:18.1.0" "@nx/devkit": "npm:^19.0.6" ignore: "npm:5.3.1" nx: "npm:^19.0.6" @@ -247,33 +247,33 @@ __metadata: peerDependencies: "@angular-devkit/core": ">= 18.0.0 < 19.0.0" "@angular-devkit/schematics": ">= 18.0.0 < 19.0.0" - checksum: bf4f1c6580128bff730cf0b2d931c21b0c1332637b9513dce3cd336ed3e8d58a2df75ef2eb412080d9a2420387e6fc0e7c5510457af633e2cd35c6802c93a029 + checksum: ccc2aa8a1849ec337143293495b0897c7cb399258060b4a4127838fa1835763b9a2b0a19dc6a430a189bf963087324eb416769b2289cd6263da27879141aa990 languageName: node linkType: hard "@angular-eslint/template-parser@npm:^18.0.0": - version: 18.0.1 - resolution: "@angular-eslint/template-parser@npm:18.0.1" + version: 18.1.0 + resolution: "@angular-eslint/template-parser@npm:18.1.0" dependencies: - "@angular-eslint/bundled-angular-compiler": "npm:18.0.1" + "@angular-eslint/bundled-angular-compiler": "npm:18.1.0" eslint-scope: "npm:^8.0.0" peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: "*" - checksum: f3005a8acdd0fcb111af4a9ddd23342e1f3455cf34f827ec00baede23e51d301f3d7ea1d9f908536467db63b286c3ea8ec449a83fa1944b2d6a1f13d2f22cb5b + checksum: 52ecb0b7c9546623aa399aa0a65364f775c818c77f4e35a2a2e507ddba1428a61cea2b0b4dcbac76b00e2b671ba524752c38ebcddf15e097caf6963dfbb82e24 languageName: node linkType: hard -"@angular-eslint/utils@npm:18.0.1": - version: 18.0.1 - resolution: "@angular-eslint/utils@npm:18.0.1" +"@angular-eslint/utils@npm:18.1.0": + version: 18.1.0 + resolution: "@angular-eslint/utils@npm:18.1.0" dependencies: - "@angular-eslint/bundled-angular-compiler": "npm:18.0.1" + "@angular-eslint/bundled-angular-compiler": "npm:18.1.0" peerDependencies: - "@typescript-eslint/utils": ^7.11.0 || ^8.0.0-alpha.20 + "@typescript-eslint/utils": ^7.11.0 || ^8.0.0-alpha.37 eslint: ^8.57.0 || ^9.0.0 typescript: "*" - checksum: 3b283b506a00bae0b62c487866108e6520a24ba13ad00795fa343557765204bd199cc417008cd1ba9825d820ec923ef83e4cbd3bd147f396d5ebaa34d7b505a5 + checksum: 81c7f29bcda7e93bf97f1514aad7ed6583c0a5c093d67e17df491d9cfd2387b21269400d57505ac1b4dc617b6007f655333d1ae98ef2aab6d20fe156db977b2a languageName: node linkType: hard @@ -5873,9 +5873,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001629": - version: 1.0.30001638 - resolution: "caniuse-lite@npm:1.0.30001638" - checksum: 33019e0c53ed73f1e728b6f313efed2d7a25710dfa2ad3924d2be9939df10d0991556ac87523d3177d472c246654c9216f03e5532717ed97df58014728c3e798 + version: 1.0.30001639 + resolution: "caniuse-lite@npm:1.0.30001639" + checksum: 3f56ce3d516a4fba959ad10ed6ecb15c6329233fc01f9f2714234a2ca91f408296d708a366ece510ca6566f71cb80d20d4c019441a1451ac1456e0128c8de78a languageName: node linkType: hard @@ -10367,7 +10367,7 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:7.0.4, https-proxy-agent@npm:^7.0.1": +"https-proxy-agent@npm:7.0.4": version: 7.0.4 resolution: "https-proxy-agent@npm:7.0.4" dependencies: @@ -10397,6 +10397,16 @@ __metadata: languageName: node linkType: hard +"https-proxy-agent@npm:^7.0.1": + version: 7.0.5 + resolution: "https-proxy-agent@npm:7.0.5" + dependencies: + agent-base: "npm:^7.0.2" + debug: "npm:4" + checksum: 2490e3acec397abeb88807db52cac59102d5ed758feee6df6112ab3ccd8325e8a1ce8bce6f4b66e5470eca102d31e425ace904242e4fa28dbe0c59c4bafa7b2c + languageName: node + linkType: hard + "human-signals@npm:^2.1.0": version: 2.1.0 resolution: "human-signals@npm:2.1.0" @@ -16847,13 +16857,13 @@ __metadata: linkType: hard "string-width@npm:^7.0.0": - version: 7.1.0 - resolution: "string-width@npm:7.1.0" + version: 7.2.0 + resolution: "string-width@npm:7.2.0" dependencies: emoji-regex: "npm:^10.3.0" get-east-asian-width: "npm:^1.0.0" strip-ansi: "npm:^7.1.0" - checksum: 68a99fbc3bd3d8eb42886ff38dce819767dee55f606f74dfa4687a07dfd21262745d9683df0aa53bf81a5dd47c13da921a501925b974bec66a7ddd634fef0634 + checksum: eb0430dd43f3199c7a46dcbf7a0b34539c76fe3aa62763d0b0655acdcbdf360b3f66f3d58ca25ba0205f42ea3491fa00f09426d3b7d3040e506878fc7664c9b9 languageName: node linkType: hard From 77ec4e5bd53ff0ff7cb9f05854034b4228a6b36d Mon Sep 17 00:00:00 2001 From: cipchk Date: Tue, 2 Jul 2024 19:29:23 +0800 Subject: [PATCH 2/6] chore: fix ng update --- .../V18/remove-ng-less-javascript-enabled-patch.ts | 12 +++++++----- scripts/ci/build-schematics.sh | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/schematics/ng-update/upgrade-rules/V18/remove-ng-less-javascript-enabled-patch.ts b/schematics/ng-update/upgrade-rules/V18/remove-ng-less-javascript-enabled-patch.ts index dfaad04c4..a04a79cf5 100644 --- a/schematics/ng-update/upgrade-rules/V18/remove-ng-less-javascript-enabled-patch.ts +++ b/schematics/ng-update/upgrade-rules/V18/remove-ng-less-javascript-enabled-patch.ts @@ -7,13 +7,15 @@ export function removeNljep(): Rule { return (tree: Tree, context: SchematicContext) => { const json = readPackage(tree); if (json == null) return; - if (!json.devDependencies[PACKAGE_NAME]) return; + const postinstall = json.scripts.postinstall; - if (typeof postinstall !== 'string') return; - if (!postinstall.includes(PACKAGE_NAME)) return; + if (typeof postinstall === 'string' && postinstall.includes(PACKAGE_NAME)) { + json.scripts.postinstall = postinstall.replace(`${PACKAGE_NAME}`, ''); + } - json.scripts.postinstall = postinstall.replace(`${PACKAGE_NAME}`, ''); - delete json.devDependencies[PACKAGE_NAME]; + if (json.devDependencies[PACKAGE_NAME]) { + delete json.devDependencies[PACKAGE_NAME]; + } writePackage(tree, json); diff --git a/scripts/ci/build-schematics.sh b/scripts/ci/build-schematics.sh index 23a594251..a651159ed 100755 --- a/scripts/ci/build-schematics.sh +++ b/scripts/ci/build-schematics.sh @@ -252,7 +252,7 @@ echo "Finished!!" if [[ ${DEBUG} == true ]]; then cd ../../ DEBUG_FROM=${PWD}/work/delon/dist/ng-alain/* - DEBUG_TO=${PWD}/work/ng17/node_modules/ng-alain/ + DEBUG_TO=${PWD}/work/ng-alain/node_modules/ng-alain/ echo "DEBUG_FROM:${DEBUG_FROM}" echo "DEBUG_TO:${DEBUG_TO}" rm -rf ${DEBUG_TO} From 77270489a3fac772a9b03a4ec4771e99b612b257 Mon Sep 17 00:00:00 2001 From: cipchk Date: Tue, 2 Jul 2024 19:31:29 +0800 Subject: [PATCH 3/6] docs: udpate --- docs/upgrade-v18.en-US.md | 7 +++++++ docs/upgrade-v18.zh-CN.md | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/docs/upgrade-v18.en-US.md b/docs/upgrade-v18.en-US.md index 66fa5f52d..df4b6b68a 100644 --- a/docs/upgrade-v18.en-US.md +++ b/docs/upgrade-v18.en-US.md @@ -16,8 +16,15 @@ hot: true 1. Make sure `Node.js` >= `18.19.1`. 2. Create a new branch, or use other methods to back up the current project. 3. Delete the `package-lock.json` or `yarn.lock` file. +4. Remove `"postinstall": "ng-less-javascript-enabled-patch"` in `package.json`. ### 1.Upgrade dependencies - Upgrade Angular to 17.x version, Run `ng update @angular/core@18 @angular/cli@18 @angular-eslint/schematics@18 ng-zorro-antd@18 ng-alain@18`. - _Run `ng update @angular/cdk@18`, if you have used `@angular/cdk`._ + +### QA + +**throw new Error(`Not found ${lessLangPath}`);** + +Please remove `"postinstall": "ng-less-javascript-enabled-patch"` first, save the file and then upgrade. `ng-less-javascript-enabled-patch` will be automatically deleted during the upgrade. diff --git a/docs/upgrade-v18.zh-CN.md b/docs/upgrade-v18.zh-CN.md index e6dd3b76e..199b12f7d 100644 --- a/docs/upgrade-v18.zh-CN.md +++ b/docs/upgrade-v18.zh-CN.md @@ -15,6 +15,7 @@ hot: true 1. 首先确保你 `Node.js` >= `18.19.1` 2. 创建新的分支，或者使用其他方式备份当前项目 3. 删除项目下 `package-lock.json` 或 `yarn.lock` 文件 +4. 移除 `package.json` 中的 `"postinstall": "ng-less-javascript-enabled-patch"` ## 升级步骤 @@ -22,3 +23,9 @@ hot: true - 将项目升级到 Angular 17 运行 `ng update @angular/core@18 @angular/cli@18 @angular-eslint/schematics@18 ng-zorro-antd@18 ng-alain@18`。 - _如果你有单独使用 `@angular/cdk` 请执行 `ng update @angular/cdk@18`_ + +### QA + +**throw new Error(`Not found ${lessLangPath}`);** + +请先移除 `"postinstall": "ng-less-javascript-enabled-patch"` 保存后再进行升级，`ng-less-javascript-enabled-patch` 会在升级中自动删除。 From 94c512dde37c9ba388f38c37eb29001a355cd7e1 Mon Sep 17 00:00:00 2001 From: cipchk Date: Tue, 2 Jul 2024 19:41:54 +0800 Subject: [PATCH 4/6] release(next): release base --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/deploy-site.yml | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6322c7333..9e213fb4a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' cache: 'yarn' @@ -68,7 +68,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' cache: 'yarn' @@ -92,7 +92,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' cache: 'yarn' @@ -109,7 +109,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' cache: 'yarn' diff --git a/.github/workflows/deploy-site.yml b/.github/workflows/deploy-site.yml index 066084e65..d1f69f4fd 100644 --- a/.github/workflows/deploy-site.yml +++ b/.github/workflows/deploy-site.yml @@ -9,7 +9,7 @@ jobs: environment: prod steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' - run: yarn install diff --git a/package.json b/package.json index 6767642fc..8fb807b8c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "delon", - "version": "17.3.1", + "version": "18.0.0-beta.0", "description": "Delon is a set of essential modules for NG-ALAIN.", "keywords": [ "delon", From a78270845a9c18fabcf654212092f87862046618 Mon Sep 17 00:00:00 2001 From: cipchk Date: Tue, 2 Jul 2024 19:50:21 +0800 Subject: [PATCH 5/6] chore: update --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 59020b237..4611a38c5 100644 --- a/.gitignore +++ b/.gitignore @@ -33,7 +33,6 @@ scripts/build/var.less /schematics/plugin/files/rtl # Yarn -# yarn.lock yarn-error.log .yarn/* !.yarn/patches From c11f16e89a0e6a8089d3e71a8a55f06655e57ce3 Mon Sep 17 00:00:00 2001 From: cipchk Date: Tue, 2 Jul 2024 20:06:45 +0800 Subject: [PATCH 6/6] docs: update --- docs/upgrade-v18.en-US.md | 2 ++ docs/upgrade-v18.zh-CN.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docs/upgrade-v18.en-US.md b/docs/upgrade-v18.en-US.md index df4b6b68a..91594caec 100644 --- a/docs/upgrade-v18.en-US.md +++ b/docs/upgrade-v18.en-US.md @@ -23,6 +23,8 @@ hot: true - Upgrade Angular to 17.x version, Run `ng update @angular/core@18 @angular/cli@18 @angular-eslint/schematics@18 ng-zorro-antd@18 ng-alain@18`. - _Run `ng update @angular/cdk@18`, if you have used `@angular/cdk`._ +> NG-ALAIN scaffolding upgrade all change files, please refer to: [#2394](https://github.com/ng-alain/ng-alain/pull/2504/files). + ### QA **throw new Error(`Not found ${lessLangPath}`);** diff --git a/docs/upgrade-v18.zh-CN.md b/docs/upgrade-v18.zh-CN.md index 199b12f7d..d6fc7d20e 100644 --- a/docs/upgrade-v18.zh-CN.md +++ b/docs/upgrade-v18.zh-CN.md @@ -24,6 +24,8 @@ hot: true - 将项目升级到 Angular 17 运行 `ng update @angular/core@18 @angular/cli@18 @angular-eslint/schematics@18 ng-zorro-antd@18 ng-alain@18`。 - _如果你有单独使用 `@angular/cdk` 请执行 `ng update @angular/cdk@18`_ +> NG-ALAIN脚手架升级全部变更文件，请参考：[#2394](https://github.com/ng-alain/ng-alain/pull/2504/files)。 + ### QA **throw new Error(`Not found ${lessLangPath}`);**