From b1b5d0ffdc40b5fe60d6b4538fa3352741057944 Mon Sep 17 00:00:00 2001 From: cipchk Date: Wed, 13 Mar 2024 14:12:06 +0800 Subject: [PATCH 1/6] release(17.3.0): release 17.3.0 --- CHANGELOG.md | 19 +++++++++++++++++++ docs/changelog.en-US.md | 17 +++++++++++++++++ docs/changelog.zh-CN.md | 17 +++++++++++++++++ package.json | 2 +- 4 files changed, 54 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13df17146..df2ef215d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +# [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) diff --git a/docs/changelog.en-US.md b/docs/changelog.en-US.md index 2ab8b2f27..d7876571c 100644 --- a/docs/changelog.en-US.md +++ b/docs/changelog.en-US.md @@ -14,6 +14,23 @@ NG-ALAIN strictly follows [Semantic Versioning 2.0.0](http://semver.org/lang/zh- --- +# [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 diff --git a/docs/changelog.zh-CN.md b/docs/changelog.zh-CN.md index 0b30eaed3..776975c07 100644 --- a/docs/changelog.zh-CN.md +++ b/docs/changelog.zh-CN.md @@ -14,6 +14,23 @@ NG-ALAIN 严格遵循 [Semantic Versioning 2.0.0](http://semver.org/lang/zh-CN/) --- +# [17.3.0](https://github.com/ng-alain/delon/compare/17.2.0...17.3.0) (2024-03-13) + +### Bug Fixes + +* **abc:reuse-tab:** 修复未使用组件时无法触发路由复用 ([#1769](https://github.com/ng-alain/delon/issues/1769)) ([4cb939b](https://github.com/ng-alain/delon/commit/4cb939b390967262584f1ca50623f764fe98fa7f)) +* **abc:st:** 修复多表头下触发排序错位 ([#1767](https://github.com/ng-alain/delon/issues/1767)) ([4e9aab8](https://github.com/ng-alain/delon/commit/4e9aab89105df1f01061c51acfc921e06270c772)) +* `@delon/theme` 依赖安装 `@delon/abc` 和 `@delon/form` ([#1766](https://github.com/ng-alain/delon/issues/1766)) ([b7ea5ac](https://github.com/ng-alain/delon/commit/b7ea5ac9d08d97bec9609f6a4572213ba79116a8)) + +### Features + +* **auth:** 忽略所有本地路径，指的是 `assets/` 路径 ([#1775](https://github.com/ng-alain/delon/issues/1775)) ([cd8641e](https://github.com/ng-alain/delon/commit/cd8641e5902e1eedd78053591e84320426502be9)) + +### Breaking Changes + +* **abc:cell** 自定义小部件 `data` 属性类型由变更为 `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 diff --git a/package.json b/package.json index ccd331eab..9a153c70a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "delon", - "version": "17.2.0", + "version": "17.3.0", "description": "Delon is a set of essential modules for NG-ALAIN.", "keywords": [ "delon", From 4a63a1f9a134e6431f556f95545378cf98c5cdb1 Mon Sep 17 00:00:00 2001 From: cipchk Date: Wed, 13 Mar 2024 14:28:13 +0800 Subject: [PATCH 2/6] release(17.3.0): release 17.3.0 --- scripts/ci/build-artifacts.sh | 1 + scripts/publish/publish.sh | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/scripts/ci/build-artifacts.sh b/scripts/ci/build-artifacts.sh index 5ecca92af..2f68037eb 100755 --- a/scripts/ci/build-artifacts.sh +++ b/scripts/ci/build-artifacts.sh @@ -17,6 +17,7 @@ commitMessage=$(git log --oneline -n 1) commitMessageCheck=$(git log --oneline -n 2) echo "Current commit author name: ${commitAuthorName}" +echo "Current commit message: ${commitMessageCheck}" # if [[ ${commitAuthorName} != '卡色' && ${commitAuthorName} != 'cipchk' ]]; then # echo "Warning: Just only 卡色 or cipchk user" diff --git a/scripts/publish/publish.sh b/scripts/publish/publish.sh index 506d97a46..b8dcc3663 100755 --- a/scripts/publish/publish.sh +++ b/scripts/publish/publish.sh @@ -27,6 +27,11 @@ clone() { cd ${DIST} echo ">>> Clone delon & cli dist..." git clone --depth 1 https://github.com/ng-alain/delon-builds.git + BUILD_VERSION=$(node -p "require('${ROOT}/ng-alain/package.json').version") + if [[ VERSION != BUILD_VERSION ]]; then + echo "待发布版本[${VERSION}]与远程版本[${BUILD_VERSION}]不一致" + exit 1 + fi } publishToMaster() { From 893a34b7271bc85ce5ac4a05b87fe27b975d23f5 Mon Sep 17 00:00:00 2001 From: cipchk Date: Wed, 13 Mar 2024 14:34:29 +0800 Subject: [PATCH 3/6] release(17.3.0): release 17.3.0 --- scripts/ci/build-artifacts.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci/build-artifacts.sh b/scripts/ci/build-artifacts.sh index 2f68037eb..7be84966b 100755 --- a/scripts/ci/build-artifacts.sh +++ b/scripts/ci/build-artifacts.sh @@ -13,8 +13,8 @@ DIST="$(pwd)/dist" commitSha=$(git rev-parse --short HEAD) commitAuthorName=$(git --no-pager show -s --format='%an' HEAD) commitAuthorEmail=$(git --no-pager show -s --format='%ae' HEAD) -commitMessage=$(git log --oneline -n 1) -commitMessageCheck=$(git log --oneline -n 2) +commitMessage=$(git show -s --format=%s) +commitMessageCheck=$(git show -s --format=%s) echo "Current commit author name: ${commitAuthorName}" echo "Current commit message: ${commitMessageCheck}" From 83feb3afb48ad4c374ce763d6894d873f48ddee0 Mon Sep 17 00:00:00 2001 From: cipchk Date: Wed, 13 Mar 2024 14:39:59 +0800 Subject: [PATCH 4/6] release(17.3.0): release 17.3.0 --- .github/workflows/ci.yml | 1 + scripts/ci/build-artifacts.sh | 12 +++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f3e76ed0..550bd15ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,6 +32,7 @@ jobs: run: ./scripts/ci/build-artifacts.sh env: ACCESS_TOKEN: ${{ secrets.CI_TOKEN }} + MESSAGE: ${{ github.event.head_commit.message }} - name: Build site run: yarn run site:build - name: 'Deploy Site' diff --git a/scripts/ci/build-artifacts.sh b/scripts/ci/build-artifacts.sh index 7be84966b..2d1727381 100755 --- a/scripts/ci/build-artifacts.sh +++ b/scripts/ci/build-artifacts.sh @@ -13,11 +13,9 @@ DIST="$(pwd)/dist" commitSha=$(git rev-parse --short HEAD) commitAuthorName=$(git --no-pager show -s --format='%an' HEAD) commitAuthorEmail=$(git --no-pager show -s --format='%ae' HEAD) -commitMessage=$(git show -s --format=%s) -commitMessageCheck=$(git show -s --format=%s) echo "Current commit author name: ${commitAuthorName}" -echo "Current commit message: ${commitMessageCheck}" +echo "Current commit message: ${MESSAGE}" # if [[ ${commitAuthorName} != '卡色' && ${commitAuthorName} != 'cipchk' ]]; then # echo "Warning: Just only 卡色 or cipchk user" @@ -44,7 +42,7 @@ branchName=${TRAVIS_BRANCH:-'master'} buildVersionName="${buildVersion}-${commitSha}" buildTagName="${branchName}-${commitSha}" -buildCommitMessage="${branchName} - ${commitMessage}" +buildCommitMessage="${branchName} - ${MESSAGE}" repoUrl="https://github.com/ng-alain/${packageRepo}.git" repoDir="${DIST}/${packageRepo}" @@ -80,7 +78,7 @@ cp -r ${buildDir}/* ./ echo "Removed everything from ${packageRepo}#${branchName} and added the new build output." # 替换版本号 -if [[ $commitMessageCheck =~ "release(" ]]; then +if [[ $MESSAGE =~ "release(" ]]; then echo "===== Release version does not need to change version =====" else echo "Replace build version..." @@ -110,9 +108,9 @@ git push origin ${branchName} --tags echo "Published package artifacts for ${packageName}#${buildVersionName} into ${branchName}" -if [[ $commitMessageCheck =~ "release(" ]]; then +if [[ $MESSAGE =~ "release(" ]]; then echo "Release version does not need to change version =====" - echo "COMMIT SOURCE: ${commitMessageCheck}" + echo "COMMIT SOURCE: ${MESSAGE}" fi echo "Download link:" From b76e088677a160b0d11012ab536d5e960bc024e2 Mon Sep 17 00:00:00 2001 From: cipchk Date: Wed, 13 Mar 2024 14:43:40 +0800 Subject: [PATCH 5/6] release(17.3.0): release 17.3.0 --- .github/workflows/ci.yml | 2 +- scripts/ci/build-artifacts.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 550bd15ed..4a0460400 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: run: ./scripts/ci/build-artifacts.sh env: ACCESS_TOKEN: ${{ secrets.CI_TOKEN }} - MESSAGE: ${{ github.event.head_commit.message }} + MESSAGE: ${{ github.event.pull_request.title || github.event.head_commit.message }} - name: Build site run: yarn run site:build - name: 'Deploy Site' diff --git a/scripts/ci/build-artifacts.sh b/scripts/ci/build-artifacts.sh index 2d1727381..1fd8e5886 100755 --- a/scripts/ci/build-artifacts.sh +++ b/scripts/ci/build-artifacts.sh @@ -4,12 +4,6 @@ set -e readonly thisDir=$(cd $(dirname $0); pwd) -${thisDir}/build.sh - -cd $(dirname $0)/../.. - -DIST="$(pwd)/dist" - commitSha=$(git rev-parse --short HEAD) commitAuthorName=$(git --no-pager show -s --format='%an' HEAD) commitAuthorEmail=$(git --no-pager show -s --format='%ae' HEAD) @@ -17,6 +11,12 @@ commitAuthorEmail=$(git --no-pager show -s --format='%ae' HEAD) echo "Current commit author name: ${commitAuthorName}" echo "Current commit message: ${MESSAGE}" +${thisDir}/build.sh + +cd $(dirname $0)/../.. + +DIST="$(pwd)/dist" + # if [[ ${commitAuthorName} != '卡色' && ${commitAuthorName} != 'cipchk' ]]; then # echo "Warning: Just only 卡色 or cipchk user" # exit 0 From a1b844e73280a07a6a3b608a3f32fbd20b6ec183 Mon Sep 17 00:00:00 2001 From: cipchk Date: Wed, 13 Mar 2024 14:48:56 +0800 Subject: [PATCH 6/6] chore: fix --- scripts/publish/publish.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/publish/publish.sh b/scripts/publish/publish.sh index b8dcc3663..261506587 100755 --- a/scripts/publish/publish.sh +++ b/scripts/publish/publish.sh @@ -28,7 +28,7 @@ clone() { echo ">>> Clone delon & cli dist..." git clone --depth 1 https://github.com/ng-alain/delon-builds.git BUILD_VERSION=$(node -p "require('${ROOT}/ng-alain/package.json').version") - if [[ VERSION != BUILD_VERSION ]]; then + if [[ $VERSION != $BUILD_VERSION ]]; then echo "待发布版本[${VERSION}]与远程版本[${BUILD_VERSION}]不一致" exit 1 fi