From dc94f0cad02eac8e237b0dc40e173bb1f4db2d92 Mon Sep 17 00:00:00 2001 From: hamster1963 <1410514192@qq.com> Date: Mon, 30 Sep 2024 10:25:53 +0800 Subject: [PATCH 1/7] fix: workflows deploy config --- .github/workflows/Deploy.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/Deploy.yml b/.github/workflows/Deploy.yml index 2bed758..c484a9d 100644 --- a/.github/workflows/Deploy.yml +++ b/.github/workflows/Deploy.yml @@ -5,6 +5,10 @@ on: tags: - "v*" + +env: + REGISTRY_IMAGE: hamster1963/nezha-dash + jobs: build-and-push: runs-on: ubuntu-latest @@ -25,20 +29,13 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Login to AliYun Container Registry - uses: docker/login-action@v3 - with: - registry: registry.cn-guangzhou.aliyuncs.com - username: ${{ secrets.ALI_USERNAME }} - password: ${{ secrets.ALI_TOKEN }} - name: Extract metadata (tags, labels) for Docker id: meta uses: docker/metadata-action@v5 with: images: | - hamster1963/nezha-dash - registry.cn-guangzhou.aliyuncs.com/hamster-home/nezha-dash + ${{ env.REGISTRY_IMAGE }} tags: | type=raw,value=latest type=ref,event=tag From 54af3fba2af7e65001653ef503fdae4a8b7150f1 Mon Sep 17 00:00:00 2001 From: hamster1963 <1410514192@qq.com> Date: Mon, 30 Sep 2024 10:53:10 +0800 Subject: [PATCH 2/7] fix: restore aliyun registry --- .github/workflows/Deploy.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Deploy.yml b/.github/workflows/Deploy.yml index c484a9d..69cefbf 100644 --- a/.github/workflows/Deploy.yml +++ b/.github/workflows/Deploy.yml @@ -5,9 +5,9 @@ on: tags: - "v*" - env: REGISTRY_IMAGE: hamster1963/nezha-dash + ALIYUN_REGISTRY_IMAGE: registry.cn-guangzhou.aliyuncs.com/hamster-home/nezha-dash jobs: build-and-push: @@ -29,6 +29,12 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to AliYun Container Registry + uses: docker/login-action@v3 + with: + registry: registry.cn-guangzhou.aliyuncs.com + username: ${{ secrets.ALI_USERNAME }} + password: ${{ secrets.ALI_TOKEN }} - name: Extract metadata (tags, labels) for Docker id: meta @@ -36,6 +42,7 @@ jobs: with: images: | ${{ env.REGISTRY_IMAGE }} + ${{ env.ALIYUN_REGISTRY_IMAGE }} tags: | type=raw,value=latest type=ref,event=tag From 4671ee3aaff79b94c1a1b3a469193c5452be9d4c Mon Sep 17 00:00:00 2001 From: hamster1963 <1410514192@qq.com> Date: Mon, 30 Sep 2024 22:32:37 +0800 Subject: [PATCH 3/7] feat: git-cliff-action --- .github/workflows/Deploy.yml | 28 ++++++++++++ git-cliff-config/cliff.toml | 83 ++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 git-cliff-config/cliff.toml diff --git a/.github/workflows/Deploy.yml b/.github/workflows/Deploy.yml index 69cefbf..5e2c76f 100644 --- a/.github/workflows/Deploy.yml +++ b/.github/workflows/Deploy.yml @@ -10,7 +10,35 @@ env: ALIYUN_REGISTRY_IMAGE: registry.cn-guangzhou.aliyuncs.com/hamster-home/nezha-dash jobs: + changelog: + name: Generate Changelog + runs-on: ubuntu-latest + outputs: + release_body: ${{ steps.git-cliff.outputs.content }} + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Generate a changelog + uses: orhun/git-cliff-action@v4 + id: git-cliff + with: + config: git-cliff-config/cliff.toml + args: -vv --latest --strip 'footer' + env: + OUTPUT: CHANGES.md + - name: Release + uses: softprops/action-gh-release@v2 + if: startsWith(github.ref, 'refs/tags/') + with: + body: ${{ steps.git-cliff.outputs.content }} + token: ${{ secrets.GITHUB_TOKEN }} + env: + GITHUB_REPOSITORY: ${{ github.repository }} + build-and-push: + name: Build and push Docker image runs-on: ubuntu-latest environment: Production steps: diff --git a/git-cliff-config/cliff.toml b/git-cliff-config/cliff.toml new file mode 100644 index 0000000..940461c --- /dev/null +++ b/git-cliff-config/cliff.toml @@ -0,0 +1,83 @@ +# git-cliff ~ configuration file +# https://git-cliff.org/docs/configuration +# +# Lines starting with "#" are comments. +# Configuration options are organized into tables and keys. +# See documentation for more information on available options. + +[changelog] +# changelog header +header = """ +# Changelog\n +""" +# template for the changelog body +# https://tera.netlify.app/docs/ +body = """ +{% if version %}\ + ## Release {{ version | trim_start_matches(pat="v") }} - {{ timestamp | date(format="%Y-%m-%d") }} +{% else %}\ + ## [unreleased] +{% endif %}\ + +{% for group, commits in commits | group_by(attribute="group") %} + ### {{ group | upper_first }} + {% for commit in commits %} + * {{ commit.message | upper_first }} ([{{ commit.id | truncate(length=7, end="") }}]($REPO/commit/{{ commit.id }})) by [@{{ commit.author.name }}](https://github.com/{{ commit.author.name }})\ + {% for footer in commit.footers -%} + , {{ footer.token }}{{ footer.separator }}{{ footer.value }}\ + {% endfor %}\ + {% endfor %} +{% endfor %}\n +""" +# remove the leading and trailing whitespace from the template +trim = true +postprocessors = [ + { pattern = '\$REPO', replace = "https://github.com/hamster1963/nezha-dash" }, # replace repository URL +] +# changelog footer +footer = """ +""" + + +[git] +# parse the commits based on https://www.conventionalcommits.org +conventional_commits = true +# filter out the commits that are not conventional +filter_unconventional = true +# process each line of a commit as an individual commit +split_commits = true +# regex for preprocessing the commit messages +commit_preprocessors = [ + { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/orhun/git-cliff/issues/${2}))" }, +] +# regex for parsing and grouping commits +commit_parsers = [ + { message = "^feat", group = "โ›ฐ๏ธ Features" }, + { message = "^fix", group = "๐Ÿ› Bug Fixes" }, + { message = "^doc", group = "๐Ÿ“š Documentation" }, + { message = "^perf", group = "โšก Performance" }, + { message = "^refactor", group = "๐Ÿšœ Refactor" }, + { message = "^style", group = "๐ŸŽจ Styling" }, + { message = "^test", group = "๐Ÿงช Testing" }, + { message = "^chore\\(release\\): prepare for", skip = true }, + { message = "^chore\\(pr\\)", skip = true }, + { message = "^chore\\(pull\\)", skip = true }, + { message = "^chore", group = "โš™๏ธ Miscellaneous Tasks" }, + { body = ".*security", group = "๐Ÿ›ก๏ธ Security" }, + { message = "^update", group = "๐Ÿ”ผ Updates" }, + { message = "^delete", group = "๐Ÿ”ž Delete" }, +] +# protect breaking changes from being skipped due to matching a skipping commit_parser +protect_breaking_commits = false +# filter out the commits that are not matched by commit parsers +filter_commits = false +# glob pattern for matching git tags +tag_pattern = "v[0-20]*" +# regex for skipping tags +skip_tags = "" +# regex for ignoring tags +ignore_tags = "v.*-beta.*" +# sort the tags topologically +topo_order = false +# sort the commits inside sections by oldest/newest order +sort_commits = "oldest" From 99ead50d1c27324275c7967be62564e7b3f3ec12 Mon Sep 17 00:00:00 2001 From: hamster1963 <1410514192@qq.com> Date: Mon, 30 Sep 2024 23:01:07 +0800 Subject: [PATCH 4/7] perf: force-static --- app/[locale]/layout.tsx | 6 ++++-- next.config.mjs | 13 ++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/[locale]/layout.tsx b/app/[locale]/layout.tsx index 9bfb02c..6b89ea5 100644 --- a/app/[locale]/layout.tsx +++ b/app/[locale]/layout.tsx @@ -35,6 +35,8 @@ export const viewport: Viewport = { userScalable: false, }; +export const dynamic = "force-static"; + export default function LocaleLayout({ children, params: { locale }, @@ -45,9 +47,9 @@ export default function LocaleLayout({ const messages = useMessages(); return ( - + {/* - + */} Date: Mon, 30 Sep 2024 23:30:34 +0800 Subject: [PATCH 5/7] perf: static rendering --- app/[locale]/(main)/page.tsx | 8 +++++++- app/[locale]/layout.tsx | 13 ++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/[locale]/(main)/page.tsx b/app/[locale]/(main)/page.tsx index 1f4cdb6..4de86cc 100644 --- a/app/[locale]/(main)/page.tsx +++ b/app/[locale]/(main)/page.tsx @@ -1,7 +1,13 @@ +import { unstable_setRequestLocale } from "next-intl/server"; import ServerList from "../../../components/ServerList"; import ServerOverview from "../../../components/ServerOverview"; -export default function Home() { +export default function Home({ + params: { locale }, +}: { + params: { locale: string }; +}) { + unstable_setRequestLocale(locale); return (
diff --git a/app/[locale]/layout.tsx b/app/[locale]/layout.tsx index 6b89ea5..f53c433 100644 --- a/app/[locale]/layout.tsx +++ b/app/[locale]/layout.tsx @@ -11,6 +11,8 @@ import { Inter as FontSans } from "next/font/google"; import { ThemeProvider } from "next-themes"; import { Viewport } from "next"; import { cn } from "@/lib/utils"; +import { locales } from "@/i18n-metadata"; +import { unstable_setRequestLocale } from "next-intl/server"; const fontSans = FontSans({ subsets: ["latin"], @@ -35,7 +37,10 @@ export const viewport: Viewport = { userScalable: false, }; -export const dynamic = "force-static"; +// export const dynamic = "force-static"; +export async function generateStaticParams() { + return locales.map((locale) => ({ locale })); +} export default function LocaleLayout({ children, @@ -44,12 +49,14 @@ export default function LocaleLayout({ children: React.ReactNode; params: { locale: string }; }) { + unstable_setRequestLocale(locale); + const messages = useMessages(); return ( - {/* + - */} + Date: Mon, 30 Sep 2024 23:37:52 +0800 Subject: [PATCH 6/7] perf: set force-static --- app/[locale]/layout.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/[locale]/layout.tsx b/app/[locale]/layout.tsx index f53c433..2410b08 100644 --- a/app/[locale]/layout.tsx +++ b/app/[locale]/layout.tsx @@ -37,7 +37,8 @@ export const viewport: Viewport = { userScalable: false, }; -// export const dynamic = "force-static"; +export const dynamic = "force-static"; + export async function generateStaticParams() { return locales.map((locale) => ({ locale })); } From 7a1a15b888a9fd45d4d38ee052c400a5ab17e2bf Mon Sep 17 00:00:00 2001 From: hamster1963 <1410514192@qq.com> Date: Mon, 30 Sep 2024 23:51:16 +0800 Subject: [PATCH 7/7] perf: remove edge runtime --- app/[locale]/(main)/page.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/[locale]/(main)/page.tsx b/app/[locale]/(main)/page.tsx index 4bbb174..4de86cc 100644 --- a/app/[locale]/(main)/page.tsx +++ b/app/[locale]/(main)/page.tsx @@ -2,8 +2,6 @@ import { unstable_setRequestLocale } from "next-intl/server"; import ServerList from "../../../components/ServerList"; import ServerOverview from "../../../components/ServerOverview"; -export const runtime = 'edge'; - export default function Home({ params: { locale }, }: {