Merge branch 'canary' into feat/demo-favicon-page

Author: gabrielmfern

.changeset/legal-lemons-jump.md

@@ -0,0 +1,5 @@
+---
+"@react-email/preview-server": patch
+---
+
+fix multiple lockfile warning during email build

.changeset/warm-jars-show.md

@@ -20,7 +20,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: pnpm setup
-        uses: pnpm/action-setup@f2b2b233b538f500472c7274c7012f57857d8ce0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061
       - name: Install packages
         run: pnpm install --frozen-lockfile
       - name: Run Lint

.github/workflows/lint.yml

@@ -17,15 +17,11 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v4
       - name: pnpm setup
-        uses: pnpm/action-setup@f2b2b233b538f500472c7274c7012f57857d8ce0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061
       - name: Install packages
         run: pnpm install --frozen-lockfile
       - name: Run Build
-        run: pnpm build
-        env:
-          SPAM_ASSASSIN_HOST: ${{ secrets.SPAM_ASSASSIN_HOST }}
-          SPAM_ASSASSIN_PORT: ${{ secrets.SPAM_ASSASSIN_PORT }}
-            # Add step to find changed package directories within ./packages
+        run: pnpm turbo run build --filter=./packages/*
       - name: Find changed packages
         id: changed_packages
         uses: tj-actions/changed-files@212f9a7760ad2b8eb511185b841f3725a62c2ae0

.github/workflows/preview-release.yml

@@ -11,29 +11,22 @@ jobs:
     permissions:
       contents: write
       pull-requests: write
+    container:
+      image: node:22
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22
-      - name: Enable Corepack
-        id: pnpm-setup
-        run: |
-          corepack enable
-          corepack prepare [email protected] --activate
-          pnpm config set script-shell "/usr/bin/bash"
+        uses: actions/checkout@c2d88d3ecc89a9ef08eebf45d9637801dcee7eb5
+      - run: git config --global --add safe.directory $GITHUB_WORKSPACE
+      - name: pnpm setup
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061
       - name: Install packages
         run: pnpm install --frozen-lockfile
       - name: Enter prerelease mode
         # This step errors if it is already in prerelease mode
         continue-on-error: true
         run: pnpm canary:enter
       - name: Create "version packages" pull request or publish release
-        uses: changesets/action@06245a4e0a36c064a573d4150030f5ec548e4fcc
+        uses: changesets/action@v1.5.3
         with:
           version: pnpm run version
           publish: pnpm run release

.github/workflows/release-canary.yml

@@ -10,26 +10,22 @@ jobs:
     permissions: 
       contents: write
       pull-requests: write
+    container:
+      image: node:22
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22
+        uses: actions/checkout@c2d88d3ecc89a9ef08eebf45d9637801dcee7eb5
+      - run: git config --global --add safe.directory $GITHUB_WORKSPACE
       - name: pnpm setup
-        uses: pnpm/action-setup@f2b2b233b538f500472c7274c7012f57857d8ce0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061
       - name: Install packages
-        if: steps.pnpm-cache.outputs.cache-hit != 'true'
         run: pnpm install --frozen-lockfile
       - name: Exit prerelease mode
         # This step errors if it is not in prerelease mode
         continue-on-error: true
         run: pnpm canary:exit
       - name: Create "version packages" pull request or publish release
-        uses: changesets/action@06245a4e0a36c064a573d4150030f5ec548e4fcc
+        uses: changesets/action@v1.5.3
         with:
           version: pnpm run version
           publish: pnpm run release

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Build and Test
+name: Tests
 on:
   push:
     branches:
@@ -12,17 +12,17 @@ permissions:
   contents: read
   pull-requests: read
 jobs:
-  build-and-test:
+  tests:
     runs-on: buildjet-4vcpu-ubuntu-2204
     outputs:
       cache-hit: ${{ steps.pnpm-cache.outputs.cache-hit }}
     container:
-      image: node:22
+      image: node:22-slim
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: pnpm setup
-        uses: pnpm/action-setup@f2b2b233b538f500472c7274c7012f57857d8ce0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061
       - name: Install packages
         run: pnpm install --frozen-lockfile
       - name: Run Build

.github/workflows/tests.yml

@@ -14,6 +14,7 @@ coverage
 .next/
 out/
 build
+next-env.d.ts
 dist
 .vercel
 

.gitignore

@@ -98,27 +98,13 @@ All components were tested using the most popular email clients.
 | -------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ |
 | Gmail ✔                                                                                           | Apple Mail ✔                                                                                           | Outlook ✔                                                                                             | Yahoo! Mail ✔                                                                                                | HEY ✔                                                                                         | Superhuman ✔                                                                                                |
 
-## Development
+## Development workflow
 
-#### Install dependencies
-
-```sh
-pnpm install
-```
-
-#### Build
-
-```sh
-pnpm build
-```
-
-#### Run packages
-
-```sh
-pnpm dev
-```
-
-This will initialize all packages in parallel and watch for changes, including the website which will be available at [localhost:3000](http://localhost:3000).
+1. [Setting up your development environment](https://react.email/docs/contributing/development-workflow/1-setup)
+2. [Running tests](https://react.email/docs/contributing/development-workflow/2-running-tests)
+3. [Linting](https://react.email/docs/contributing/development-workflow/3-linting)
+4. [Building](https://react.email/docs/contributing/development-workflow/4-building)
+5. [Writing documentation](https://react.email/docs/contributing/development-workflow/5-writing-docs)
 
 ## Contributing