Skip to content

Commit 65c0cbb

Browse files
authored
Merge branch 'canary' into canary
2 parents a7c0af6 + 6f5cb91 commit 65c0cbb

File tree

269 files changed

+8949
-4023
lines changed

Some content is hidden

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

269 files changed

+8949
-4023
lines changed

.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/tender-buckets-sin.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-email/preview-server": patch
3+
---
4+
5+
use tailwindcss v4 in the UI

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Checkout
2121
uses: actions/checkout@v4
2222
- name: pnpm setup
23-
uses: pnpm/action-setup@f2b2b233b538f500472c7274c7012f57857d8ce0
23+
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061
2424
- name: Install packages
2525
run: pnpm install --frozen-lockfile
2626
- name: Run Lint

.github/workflows/preview-release.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,11 @@ jobs:
1717
- name: Checkout Repo
1818
uses: actions/checkout@v4
1919
- name: pnpm setup
20-
uses: pnpm/action-setup@f2b2b233b538f500472c7274c7012f57857d8ce0
20+
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061
2121
- name: Install packages
2222
run: pnpm install --frozen-lockfile
2323
- name: Run Build
24-
run: pnpm build
25-
env:
26-
SPAM_ASSASSIN_HOST: ${{ secrets.SPAM_ASSASSIN_HOST }}
27-
SPAM_ASSASSIN_PORT: ${{ secrets.SPAM_ASSASSIN_PORT }}
28-
# Add step to find changed package directories within ./packages
24+
run: pnpm turbo run build --filter=./packages/*
2925
- name: Find changed packages
3026
id: changed_packages
3127
uses: tj-actions/changed-files@212f9a7760ad2b8eb511185b841f3725a62c2ae0

.github/workflows/release-canary.yml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,22 @@ jobs:
1111
permissions:
1212
contents: write
1313
pull-requests: write
14+
container:
15+
image: node:22
1416
steps:
1517
- name: Checkout Repo
16-
uses: actions/checkout@v4
17-
with:
18-
fetch-depth: 0
19-
- name: Setup Node.js
20-
uses: actions/setup-node@v4
21-
with:
22-
node-version: 22
23-
- name: Enable Corepack
24-
id: pnpm-setup
25-
run: |
26-
corepack enable
27-
corepack prepare [email protected] --activate
28-
pnpm config set script-shell "/usr/bin/bash"
18+
uses: actions/checkout@c2d88d3ecc89a9ef08eebf45d9637801dcee7eb5
19+
- run: git config --global --add safe.directory $GITHUB_WORKSPACE
20+
- name: pnpm setup
21+
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061
2922
- name: Install packages
3023
run: pnpm install --frozen-lockfile
3124
- name: Enter prerelease mode
3225
# This step errors if it is already in prerelease mode
3326
continue-on-error: true
3427
run: pnpm canary:enter
3528
- name: Create "version packages" pull request or publish release
36-
uses: changesets/action@06245a4e0a36c064a573d4150030f5ec548e4fcc
29+
uses: changesets/action@v1.5.3
3730
with:
3831
version: pnpm run version
3932
publish: pnpm run release

.github/workflows/release.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,22 @@ jobs:
1010
permissions:
1111
contents: write
1212
pull-requests: write
13+
container:
14+
image: node:22
1315
steps:
1416
- name: Checkout Repo
15-
uses: actions/checkout@v4
16-
with:
17-
fetch-depth: 0
18-
- name: Setup Node.js
19-
uses: actions/setup-node@v4
20-
with:
21-
node-version: 22
17+
uses: actions/checkout@c2d88d3ecc89a9ef08eebf45d9637801dcee7eb5
18+
- run: git config --global --add safe.directory $GITHUB_WORKSPACE
2219
- name: pnpm setup
23-
uses: pnpm/action-setup@f2b2b233b538f500472c7274c7012f57857d8ce0
20+
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061
2421
- name: Install packages
25-
if: steps.pnpm-cache.outputs.cache-hit != 'true'
2622
run: pnpm install --frozen-lockfile
2723
- name: Exit prerelease mode
2824
# This step errors if it is not in prerelease mode
2925
continue-on-error: true
3026
run: pnpm canary:exit
3127
- name: Create "version packages" pull request or publish release
32-
uses: changesets/action@06245a4e0a36c064a573d4150030f5ec548e4fcc
28+
uses: changesets/action@v1.5.3
3329
with:
3430
version: pnpm run version
3531
publish: pnpm run release

.github/workflows/tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build and Test
1+
name: Tests
22
on:
33
push:
44
branches:
@@ -12,17 +12,17 @@ permissions:
1212
contents: read
1313
pull-requests: read
1414
jobs:
15-
build-and-test:
15+
tests:
1616
runs-on: buildjet-4vcpu-ubuntu-2204
1717
outputs:
1818
cache-hit: ${{ steps.pnpm-cache.outputs.cache-hit }}
1919
container:
20-
image: node:22
20+
image: node:22-slim
2121
steps:
2222
- name: Checkout
2323
uses: actions/checkout@v4
2424
- name: pnpm setup
25-
uses: pnpm/action-setup@f2b2b233b538f500472c7274c7012f57857d8ce0
25+
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061
2626
- name: Install packages
2727
run: pnpm install --frozen-lockfile
2828
- name: Run Build

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ coverage
1414
.next/
1515
out/
1616
build
17+
next-env.d.ts
1718
dist
1819
.vercel
1920

0 commit comments

Comments
 (0)