Skip to content

Commit 9bc07bf

Browse files
HasanQQHasanQQ
authored
Merge branch 'canary' into canary
2 parents af6f11f + c1d019b commit 9bc07bf

776 files changed

Lines changed: 44604 additions & 12503 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.changeset/config.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"ignore": [
99
"@benchmarks/preview-server",
1010
"@benchmarks/tailwind-component",
11+
"@react-email/editor",
1112
"demo",
1213
"email-dev",
1314
"web"

‎.changeset/pink-rabbits-deny.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changeset/pre.json‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎.changeset/rich-files-stick.md‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.changeset/slow-carrots-ask.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-email/render": patch
3+
---
4+
5+
fix: await stream.allReady before reading renderToReadableStream output

‎.github/ISSUE_TEMPLATE/1.bug_report.yml‎

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: Bug Report
22
description: Create a bug report for React Email
33
labels: ["Type: Bug"]
44
body:
5+
- type: input
6+
attributes:
7+
label: What versions are you using? (if relevant)
8+
value: "@react-email/components@x.y.z, react-email@x.y.z, etc."
59
- type: textarea
610
attributes:
711
label: Describe the Bug
@@ -10,45 +14,47 @@ body:
1014
required: true
1115
- type: dropdown
1216
attributes:
13-
label: Which package is affected (leave empty if unsure)
17+
label: What is affected (leave empty if unsure)
1418
multiple: true
1519
options:
16-
- "@react-email/body"
17-
- "@react-email/button"
18-
- "@react-email/column"
19-
- "@react-email/components"
20-
- "@react-email/container"
21-
- "@react-email/font"
22-
- "@react-email/head"
23-
- "@react-email/heading"
24-
- "@react-email/hr"
25-
- "@react-email/html"
26-
- "@react-email/img"
27-
- "@react-email/link"
28-
- "@react-email/preview"
29-
- "@react-email/render"
30-
- "@react-email/row"
31-
- "@react-email/section"
32-
- "@react-email/tailwind"
33-
- "@react-email/text"
34-
- "client"
35-
- "create-email"
36-
- "demo"
37-
- "docs"
38-
- "examples"
39-
- "react-email"
40-
- "web"
41-
- type: input
20+
- "Preview Server"
21+
- "CLI"
22+
- "Html Component"
23+
- "Body Component"
24+
- "Head Component"
25+
- "Button Component"
26+
- "Container Component"
27+
- "CodeBlock Component"
28+
- "CodeInline Component"
29+
- "Column Component"
30+
- "Row Component"
31+
- "Font Component"
32+
- "Heading Component"
33+
- "Hr Component"
34+
- "Img Component"
35+
- "Link Component"
36+
- "Markdown Component"
37+
- "Preview Component"
38+
- "Section Component"
39+
- "Tailwind Component"
40+
- "Text Component"
41+
- "Render Utility"
42+
- "@react-email/components package"
43+
- "npx create-email"
44+
- "Demo"
45+
- "Website"
46+
- "Examples"
47+
- type: textarea
4248
attributes:
4349
label: Link to the code that reproduces this issue
44-
description: |
45-
A link to a GitHub repository minimal reproduction. A minimal reproduction code is really helpful to understand the issue.
50+
value: |
51+
A link to a GitHub repository minimal reproduction. Not your entire project, just the code necessary to reproduce the issue. Try going from the starter `npx create-email@latest` and adding only what's needed to cause the issue. If you don't share a reproduction, we might close the issue or it will take significantly longer for things to get sorted out.
4652
validations:
4753
required: true
4854
- type: textarea
4955
attributes:
5056
label: To Reproduce
51-
description: Steps to reproduce the behavior, please provide a clear description of how to reproduce the issue, based on the linked minimal reproduction. Screenshots can be provided in the issue body below. If using code blocks, make sure that [syntax highlighting is correct](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks#syntax-highlighting) and double check that the rendered preview is not broken.
57+
value: Steps to reproduce the behavior, please provide a clear description of how to reproduce the issue, based on the linked minimal reproduction. Screenshots can be provided in the issue body below. If using code blocks, make sure that [syntax highlighting is correct](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks#syntax-highlighting) and double check that the rendered preview is not broken.
5258
validations:
5359
required: true
5460
- type: textarea
@@ -67,3 +73,4 @@ body:
6773
attributes:
6874
label: What's your node version? (if relevant)
6975
description: "Please specify the exact version."
76+

‎.github/workflows/bump.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Bump
2+
on:
3+
push:
4+
branches:
5+
- canary
6+
concurrency: ${{ github.workflow }}-${{ github.ref }}
7+
jobs:
8+
bump:
9+
runs-on: blacksmith-2vcpu-ubuntu-2204
10+
permissions:
11+
contents: write
12+
pull-requests: write
13+
container:
14+
image: node:22
15+
steps:
16+
- name: Checkout Repo
17+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
18+
with:
19+
fetch-depth: 1
20+
- run: git config --global --add safe.directory $GITHUB_WORKSPACE
21+
- name: pnpm setup
22+
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320
23+
- name: Install packages
24+
run: pnpm install --frozen-lockfile --prefer-offline
25+
- name: Create "version packages" pull request
26+
uses: changesets/action@6a0a831ff30acef54f2c6aa1cbbc1096b066edaf
27+
with:
28+
version: pnpm run version
29+
title: "chore(root): version packages"
30+
env:
31+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/e2e.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: E2E Tests
2+
on:
3+
push:
4+
branches:
5+
- main
6+
- canary
7+
pull_request:
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
permissions:
12+
contents: read
13+
pull-requests: read
14+
jobs:
15+
e2e:
16+
runs-on: blacksmith-4vcpu-ubuntu-2204
17+
container:
18+
image: node:22
19+
steps:
20+
- name: Checkout Repo
21+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
22+
with:
23+
fetch-depth: 1
24+
- run: git config --global --add safe.directory $GITHUB_WORKSPACE
25+
- name: pnpm setup
26+
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320
27+
- name: Install packages
28+
run: pnpm install --frozen-lockfile --prefer-offline
29+
- name: Run Build
30+
run: pnpm build
31+
env:
32+
SPAM_ASSASSIN_HOST: ${{ secrets.SPAM_ASSASSIN_HOST }}
33+
SPAM_ASSASSIN_PORT: ${{ secrets.SPAM_ASSASSIN_PORT }}
34+
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
35+
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
36+
- name: Run Tailwind integration tests
37+
run: pnpm turbo test:e2e
38+
env:
39+
SPAM_ASSASSIN_HOST: ${{ secrets.SPAM_ASSASSIN_HOST }}
40+
SPAM_ASSASSIN_PORT: ${{ secrets.SPAM_ASSASSIN_PORT }}
41+
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
42+
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}

‎.github/workflows/lint.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,18 @@ permissions:
1313
pull-requests: read
1414
jobs:
1515
lint:
16-
runs-on: buildjet-2vcpu-ubuntu-2204
16+
runs-on: blacksmith-2vcpu-ubuntu-2204
1717
container:
1818
image: node:22-slim
1919
steps:
20-
- name: Checkout
21-
uses: actions/checkout@v4
20+
- name: Checkout Repo
21+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
22+
with:
23+
fetch-depth: 1
2224
- name: pnpm setup
23-
uses: pnpm/action-setup@f2b2b233b538f500472c7274c7012f57857d8ce0
25+
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320
2426
- name: Install packages
25-
run: pnpm install --frozen-lockfile
27+
run: pnpm install --frozen-lockfile --prefer-offline
2628
- name: Run Lint
2729
run: pnpm lint
2830
env:

‎.github/workflows/pin-dependencies-check.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,17 @@ permissions:
1313
pull-requests: read
1414
jobs:
1515
pin-dependencies-check:
16-
runs-on: buildjet-2vcpu-ubuntu-2204
16+
runs-on: blacksmith-2vcpu-ubuntu-2204
1717
container:
1818
image: node:22-slim
1919
steps:
20-
- name: Checkout
21-
uses: actions/checkout@v4
20+
- name: Checkout Repo
21+
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
22+
with:
23+
fetch-depth: 1
24+
- name: pnpm setup
25+
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320
26+
- name: Install root dependencies only
27+
run: pnpm install --frozen-lockfile --filter . --ignore-scripts
2228
- name: Check for pinned dependencies
23-
run: npx tsx ./scripts/check-dependency-versions.ts
29+
run: pnpm exec tsx ./scripts/check-dependency-versions.ts

0 commit comments

Comments
 (0)