From 044541e6793f26581c2b9c842466d73b28b6c709 Mon Sep 17 00:00:00 2001 From: Soon Date: Fri, 28 Jun 2024 16:31:09 +0800 Subject: [PATCH 1/3] docs: upgrade latest discord invitation link (#6977) docs: use latest discord link --- website/docs/en/contribute/index.mdx | 2 +- website/docs/en/guide/start/introduction.mdx | 2 +- website/docs/en/misc/team/join-us.mdx | 2 +- website/docs/zh/contribute/index.mdx | 2 +- website/docs/zh/guide/start/introduction.mdx | 2 +- website/docs/zh/misc/team/join-us.mdx | 2 +- website/rspress.config.ts | 2 +- website/theme/components/HomeFooter/index.tsx | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/website/docs/en/contribute/index.mdx b/website/docs/en/contribute/index.mdx index c09b915b09b..8bf5c151558 100644 --- a/website/docs/en/contribute/index.mdx +++ b/website/docs/en/contribute/index.mdx @@ -6,7 +6,7 @@ Every single contribution counts and helps us take Rspack to the next level. ## Asking Questions If you have any questions, -please do not hesitate to ask in either the [Discord](https://discord.gg/79ZZ66GH9E) support channel or on the [GitHub discussion board](https://github.com/web-infra-dev/rspack/discussions). +please do not hesitate to ask in either the [Discord](https://discord.gg/sYK4QjyZ4V) support channel or on the [GitHub discussion board](https://github.com/web-infra-dev/rspack/discussions). ### Minimal reproduction diff --git a/website/docs/en/guide/start/introduction.mdx b/website/docs/en/guide/start/introduction.mdx index 7769bbf5736..63f81812b10 100644 --- a/website/docs/en/guide/start/introduction.mdx +++ b/website/docs/en/guide/start/introduction.mdx @@ -115,4 +115,4 @@ Rspack and Rollup are both bundling tools, but they focus on different areas. Ro Please read [Quick start](/guide/start/quick-start) to start using Rspack. -Welcome to the [GitHub Discussions](https://github.com/web-infra-dev/rspack/discussions) and [Discord](https://discord.gg/79ZZ66GH9E) to communicate with us. +Welcome to the [GitHub Discussions](https://github.com/web-infra-dev/rspack/discussions) and [Discord](https://discord.gg/sYK4QjyZ4V) to communicate with us. diff --git a/website/docs/en/misc/team/join-us.mdx b/website/docs/en/misc/team/join-us.mdx index 50322e5e13c..fb42c133da2 100644 --- a/website/docs/en/misc/team/join-us.mdx +++ b/website/docs/en/misc/team/join-us.mdx @@ -81,5 +81,5 @@ Please send your resume to **`web-infra-careers@bytedance.com`** with the subjec If you have any questions about the position or the team, feel free to communicate with us through the following channels: -- [Discord](https://discord.gg/VjNu24wzvs) +- [Discord](https://discord.gg/sYK4QjyZ4V) - [Feishu Group](https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=131he762-7608-4553-825d-02a0be3ffe75) diff --git a/website/docs/zh/contribute/index.mdx b/website/docs/zh/contribute/index.mdx index daf33429c2c..c1ba031928f 100644 --- a/website/docs/zh/contribute/index.mdx +++ b/website/docs/zh/contribute/index.mdx @@ -5,7 +5,7 @@ ## 提出问题 -如果您遇到任何问题,请随时在 [Discord](https://discord.gg/79ZZ66GH9E) 中的 support 频道或 [GitHub discussion board](https://github.com/web-infra-dev/rspack/discussions) 提问。 +如果您遇到任何问题,请随时在 [Discord](https://discord.gg/sYK4QjyZ4V) 中的 support 频道或 [GitHub discussion board](https://github.com/web-infra-dev/rspack/discussions) 提问。 ### 最小复现 diff --git a/website/docs/zh/guide/start/introduction.mdx b/website/docs/zh/guide/start/introduction.mdx index 3a20e7b7520..a5d53573eed 100644 --- a/website/docs/zh/guide/start/introduction.mdx +++ b/website/docs/zh/guide/start/introduction.mdx @@ -129,4 +129,4 @@ Rspack 和 Rollup 虽然都是打包工具,但是两者的侧重领域不同 请阅读 [快速上手](/guide/start/quick-start) 来开始使用 Rspack。 -欢迎到 [GitHub Discussions](https://github.com/web-infra-dev/rspack/discussions) 和 [Discord](https://discord.gg/79ZZ66GH9E) 来与我们交流。 +欢迎到 [GitHub Discussions](https://github.com/web-infra-dev/rspack/discussions) 和 [Discord](https://discord.gg/sYK4QjyZ4V) 来与我们交流。 diff --git a/website/docs/zh/misc/team/join-us.mdx b/website/docs/zh/misc/team/join-us.mdx index d774fec2a1b..4e959acb388 100644 --- a/website/docs/zh/misc/team/join-us.mdx +++ b/website/docs/zh/misc/team/join-us.mdx @@ -89,5 +89,5 @@ Web Infra 团队正在寻求经验丰富的前端工程师,来共同打造高 如果你对岗位或团队有任何疑问,欢迎通过以下渠道和我们交流: -- [Discord](https://discord.gg/se2nnYdUtd) +- [Discord](https://discord.gg/sYK4QjyZ4V) - [飞书群](https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=131he762-7608-4553-825d-02a0be3ffe75) diff --git a/website/rspress.config.ts b/website/rspress.config.ts index 031f289cb51..d3dd8a481de 100644 --- a/website/rspress.config.ts +++ b/website/rspress.config.ts @@ -68,7 +68,7 @@ export default defineConfig({ { icon: 'discord', mode: 'link', - content: 'https://discord.gg/79ZZ66GH9E', + content: 'https://discord.gg/sYK4QjyZ4V', }, { icon: 'twitter', diff --git a/website/theme/components/HomeFooter/index.tsx b/website/theme/components/HomeFooter/index.tsx index defcc098acd..8fd5790437d 100644 --- a/website/theme/components/HomeFooter/index.tsx +++ b/website/theme/components/HomeFooter/index.tsx @@ -80,7 +80,7 @@ function useFooterData() { }, { title: 'Discord', - link: 'https://discord.gg/ab2Rv4BXwf', + link: 'https://discord.gg/sYK4QjyZ4V', }, { title: 'Twitter (X)', From 2fd81bebba4a0b6f5e04eeb5727ea31afa7f10a3 Mon Sep 17 00:00:00 2001 From: Soon Date: Fri, 28 Jun 2024 17:15:39 +0800 Subject: [PATCH 2/3] docs: use of nightly/canary version and install-rspack script (#6974) * docs: install-rspack * docs: update * docs: update * Apply suggestions from code review Co-authored-by: neverland --------- Co-authored-by: neverland --- .../en/contribute/development/releasing.md | 32 +++++++++++++++++ .../zh/contribute/development/releasing.md | 34 ++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/website/docs/en/contribute/development/releasing.md b/website/docs/en/contribute/development/releasing.md index ec63bf5ac99..3a5abddd8c3 100644 --- a/website/docs/en/contribute/development/releasing.md +++ b/website/docs/en/contribute/development/releasing.md @@ -31,3 +31,35 @@ The [nightly release workflow](https://github.com/web-infra-dev/rspack/actions/w is triggered every day at UTC 16:00:07, which is 00:07 AM Beijing Time (offset with an odd minute to avoid cron jobs firing off at the same time). The nightly build fully replicates the full release build for catching errors early. + +## Canary + +[canary release workflow](https://github.com/web-infra-dev/rspack/actions/workflows/release-canary.yml) requires manual triggering. + +## Using nightly/canary version + +When releasing the nightly/canary versions of Rspack, the package name will be appended with the `-canary` suffix. You need to use the overrides feature of package managers like npm, yarn, or pnpm to use these versions. + +Take pnpm as an example: + +```json title=package.json +{ + "pnpm": { + "overrides": { + "@rspack/binding": "npm:@rspack/binding-canary@nightly", + "@rspack/core": "npm:@rspack/core-canary@nightly", + "@rspack/plugin-react-refresh": "npm:@rspack/plugin-react-refresh@nightly" + }, + "peerDependencyRules": { + "allowAny": ["@rspack/*"] + } + } +} +``` + +The Rspack community provides the [install-rspack](https://github.com/rspack-contrib/install-rspack) tool to quickly modify the Rspack version: + +```shell +npx install-rspack --version nightly # Get latest nightly npm tag version +npx install-rspack --version 0.7.5-canary-d614005-20240625082730 # A specific canary version +``` diff --git a/website/docs/zh/contribute/development/releasing.md b/website/docs/zh/contribute/development/releasing.md index ec07ccdccdd..19d505ca32f 100644 --- a/website/docs/zh/contribute/development/releasing.md +++ b/website/docs/zh/contribute/development/releasing.md @@ -8,7 +8,7 @@ - `nightly` - `canary` -## latest 的全量发布 +## Latest 版本全量发布 [全量发布工作流](https://github.com/web-infra-dev/rspack/actions/workflows/release.yml?query=is%3Asuccess) 目前在每个周二被手动触发,配合全量发布的 release notes。 @@ -31,3 +31,35 @@ 在每天的 UTC 16:00:07 被触发,是 北京时间的凌晨 00:07 (偏移奇数分钟以避免 cron 作业同时触发)。 nightly 构建完全复制了全量发布构建,以便尽早发现错误。 + +## Canary + +[canary 发布工作流](https://github.com/web-infra-dev/rspack/actions/workflows/release-canary.yml) 需要手动触发。 + +## 使用 nightly/canary 版本 + +在发布 Rspack 的 nightly/canary 版本时,发布的包名会被添加 `-canary` 后缀,你需要配合包管理器 npm / yarn / pnpm 的 overrides 功能来使用这些版本。 + +以 pnpm 为例: + +```json title=package.json +{ + "pnpm": { + "overrides": { + "@rspack/binding": "npm:@rspack/binding-canary@nightly", + "@rspack/core": "npm:@rspack/core-canary@nightly", + "@rspack/plugin-react-refresh": "npm:@rspack/plugin-react-refresh@nightly" + }, + "peerDependencyRules": { + "allowAny": ["@rspack/*"] + } + } +} +``` + +Rspack 社区提供了 [install-rspack](https://github.com/rspack-contrib/install-rspack) 工具来快速修改 Rspack 版本: + +```shell +npx install-rspack --version nightly # Get latest nightly npm tag version +npx install-rspack --version 0.7.5-canary-d614005-20240625082730 # A specific canary version +``` From b8c1ce6cf84604b9c52f0d74e5b5cc2fe9200d75 Mon Sep 17 00:00:00 2001 From: neverland Date: Fri, 28 Jun 2024 17:53:17 +0800 Subject: [PATCH 3/3] chore(workflow): fix permissions for prod release (#6979) --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c4708de1e1e..ba9bfcb58a8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,6 +67,8 @@ jobs: name: Release permissions: contents: write + # To publish packages with provenance + id-token: write runs-on: ubuntu-latest needs: build if: ${{ github.event_name == 'workflow_dispatch' }}