Merge branch 'main' into feat/vs-code-preview-ext

Author: gabrielmfern

.changeset/README.md

@@ -0,0 +1,8 @@
+# Changesets
+
+Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
+with multi-package repos, or single-package repos to help you version and publish your code. You can
+find the full documentation for it [in our repository](https://github.com/changesets/changesets)
+
+We have a quick list of common questions to get you started engaging with this project in
+[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.changeset/config.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
+  "changelog": "@changesets/cli/changelog",
+  "commit": false,
+  "fixed": [
+    ["react-email-starter", "create-email"]
+  ],
+  "linked": [],
+  "access": "public",
+  "baseBranch": "main",
+  "updateInternalDependencies": "patch",
+  "ignore": [
+    "@benchmarks/preview-server",
+    "@benchmarks/tailwind-component",
+    "demo",
+    "web"
+  ]
+}

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
   - name: Ask a question
-    url: https://github.com/resendlabs/react-email/discussions
+    url: https://github.com/resend/react-email/discussions
     about: Ask questions and discuss with other community members
   - name: Feature request
-    url: https://github.com/resendlabs/react-email/discussions/new?category=ideas
+    url: https://github.com/resend/react-email/discussions/new?category=ideas
     about: Feature requests should be opened as discussions

.github/workflows/bump-canary.yml

@@ -0,0 +1,52 @@
+name: Bump canary
+
+on:
+  push:
+    branches:
+      - canary
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  release:
+    name: Bump for canary
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js 20
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+
+      - name: Enable Corepack
+        id: pnpm-setup
+        run: |
+          corepack enable
+          corepack prepare pnpm@latest --activate
+          pnpm config set script-shell "/usr/bin/bash"
+          echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
+
+      - name: pnpm Cache
+        uses: buildjet/cache@v3
+        with:
+          path: ${{ steps.pnpm-setup.outputs.pnpm_cache_dir }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install packages
+        run: pnpm install --frozen-lockfile
+
+      - name: Enter prerelease mode
+        continue-on-error: true
+        run: pnpm canary:enter
+
+      - name: Create Release Pull Request
+        uses: changesets/action@v1
+        with:
+          version: pnpm run version
+          title: "chore: Bump for release"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/bump-stable.yml

@@ -0,0 +1,52 @@
+name: Bump
+
+on:
+  push:
+    branches:
+      - main
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  release:
+    name: Bump
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js 20
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+
+      - name: Enable Corepack
+        id: pnpm-setup
+        run: |
+          corepack enable
+          corepack prepare pnpm@latest --activate
+          pnpm config set script-shell "/usr/bin/bash"
+          echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
+
+      - name: pnpm Cache
+        uses: buildjet/cache@v3
+        with:
+          path: ${{ steps.pnpm-setup.outputs.pnpm_cache_dir }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install packages
+        run: pnpm install --frozen-lockfile
+
+      - name: Exit prerelease mode
+        continue-on-error: true
+        run: pnpm canary:exit
+
+      - name: Create Release Pull Request
+        uses: changesets/action@v1
+        with:
+          version: pnpm run version
+          title: "chore: Bump for release"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tests.yml

@@ -65,12 +65,42 @@ jobs:
       - name: Run Build
         run: pnpm build
 
-      - name: Run Lint
-        run: pnpm lint
-
       - name: Run Tests
         run: pnpm test
 
+  lint:
+    runs-on: buildjet-4vcpu-ubuntu-2204
+    container:
+      image: node:18
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Enable Corepack
+        id: pnpm-setup
+        run: |
+          corepack enable
+          corepack prepare pnpm@latest --activate
+          pnpm config set script-shell "/usr/bin/bash"
+          echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
+
+      - name: pnpm Cache
+        uses: buildjet/cache@v3
+        with:
+          path: ${{ steps.pnpm-setup.outputs.pnpm_cache_dir }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install packages
+        run: pnpm install --frozen-lockfile
+
+      - name: Run Build
+        run: pnpm build
+
+      - name: Run Lint
+        run: pnpm lint
+
   build:
     runs-on: buildjet-4vcpu-ubuntu-2204
     container:
@@ -120,6 +150,9 @@ jobs:
               if (version.startsWith("workspace:")) {
                 return true;
               }
+              if (version.startsWith("npm:")) {
+                return true;
+              }
               return /^\d+\.\d+\.\d+$|^[a-z]+:[a-z]+@\d+$/.test(version);
             }
 

.gitignore

@@ -18,7 +18,6 @@ dist
 # misc
 .DS_Store
 *.pem
-.changeset
 .react-email
 
 # debug

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2022 Bu Kinoshita and Zeno Rocha
+Copyright 2024 Plus Five Five, Inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -6,7 +6,7 @@
 <div align="center">
 <a href="https://react.email">Website</a> 
 <span> · </span>
-<a href="https://github.com/resendlabs/react-email">GitHub</a> 
+<a href="https://github.com/resend/react-email">GitHub</a> 
 <span> · </span>
 <a href="https://react.email/discord">Discord</a>
 </div>
@@ -27,27 +27,27 @@ Install one of the components from your command line.
 #### With yarn
 
 ```sh
-yarn add @react-email/button -E
+yarn add @react-email/components -E
 ```
 
 #### With npm
 
 ```sh
-npm install @react-email/button -E
+npm install @react-email/components -E
 ```
 
 #### With pnpm
 
 ```sh
-pnpm install @react-email/button -E
+pnpm install @react-email/components -E
 ```
 
 ## Getting started
 
 Add the component to your email template. Include styles where needed.
 
 ```jsx
-import { Button } from "@react-email/button";
+import { Button } from "@react-email/components";
 
 const Email = () => {
   return (
@@ -62,30 +62,33 @@ const Email = () => {
 
 A set of standard components to help you build amazing emails without having to deal with the mess of creating table-based layouts and maintaining archaic markup.
 
-- [Html](https://github.com/resendlabs/react-email/tree/main/packages/html)
-- [Head](https://github.com/resendlabs/react-email/tree/main/packages/head)
-- [Heading](https://github.com/resendlabs/react-email/tree/main/packages/heading)
-- [Button](https://github.com/resendlabs/react-email/tree/main/packages/button)
-- [Link](https://github.com/resendlabs/react-email/tree/main/packages/link)
-- [Image](https://github.com/resendlabs/react-email/tree/main/packages/img)
-- [Divider](https://github.com/resendlabs/react-email/tree/main/packages/hr)
-- [Paragraph](https://github.com/resendlabs/react-email/tree/main/packages/text)
-- [Container](https://github.com/resendlabs/react-email/tree/main/packages/container)
-- [Preview](https://github.com/resendlabs/react-email/tree/main/packages/preview)
-- [Body](https://github.com/resendlabs/react-email/tree/main/packages/body)
-- [Column](https://github.com/resendlabs/react-email/tree/main/packages/column)
-- [Section](https://github.com/resendlabs/react-email/tree/main/packages/section)
-- [Font](https://github.com/resendlabs/react-email/tree/main/packages/font)
+- [Body](https://github.com/resend/react-email/tree/main/packages/body)
+- [Button](https://github.com/resend/react-email/tree/main/packages/button)
+- [CodeBlock](https://github.com/resend/react-email/tree/main/packages/code-block)
+- [CodeInline](https://github.com/resend/react-email/tree/main/packages/code-inline)
+- [Column](https://github.com/resend/react-email/tree/main/packages/column)
+- [Container](https://github.com/resend/react-email/tree/main/packages/container)
+- [Divider](https://github.com/resend/react-email/tree/main/packages/hr)
+- [Font](https://github.com/resend/react-email/tree/main/packages/font)
+- [Head](https://github.com/resend/react-email/tree/main/packages/head)
+- [Heading](https://github.com/resend/react-email/tree/main/packages/heading)
+- [Html](https://github.com/resend/react-email/tree/main/packages/html)
+- [Image](https://github.com/resend/react-email/tree/main/packages/img)
+- [Link](https://github.com/resend/react-email/tree/main/packages/link)
+- [Markdown](https://github.com/resend/react-email/tree/main/packages/markdown)
+- [Paragraph](https://github.com/resend/react-email/tree/main/packages/text)
+- [Preview](https://github.com/resend/react-email/tree/main/packages/preview)
+- [Section](https://github.com/resend/react-email/tree/main/packages/section)
 
 ## Integrations
 
 Emails built with React Email can be converted into HTML and sent using any email service provider. Here are some examples:
 
-- [Resend](https://github.com/resendlabs/react-email/tree/main/examples/resend)
-- [Nodemailer](https://github.com/resendlabs/react-email/tree/main/examples/nodemailer)
-- [SendGrid](https://github.com/resendlabs/react-email/tree/main/examples/sendgrid)
-- [Postmark](https://github.com/resendlabs/react-email/tree/main/examples/postmark)
-- [AWS SES](https://github.com/resendlabs/react-email/tree/main/examples/aws-ses)
+- [Resend](https://github.com/resend/react-email/tree/main/examples/resend)
+- [Nodemailer](https://github.com/resend/react-email/tree/main/examples/nodemailer)
+- [SendGrid](https://github.com/resend/react-email/tree/main/examples/sendgrid)
+- [Postmark](https://github.com/resend/react-email/tree/main/examples/postmark)
+- [AWS SES](https://github.com/resend/react-email/tree/main/examples/aws-ses)
 
 ## Support
 

SECURITY.md

@@ -2,8 +2,7 @@
 
 ## Supported Versions
 
-Use this section to tell people about which versions of your project are
-currently being supported with security updates.
+The security is a key priority for Resend, and we are committed to ensuring that our users are protected by promptly addressing security vulnerabilities. Below is a table outlining which versions of our project currently receive security updates:
 
 | Version | Supported          |
 | ------- | ------------------ |
@@ -12,10 +11,10 @@ currently being supported with security updates.
 | 4.0.x   | :white_check_mark: |
 | < 4.0   | :x:                |
 
+We encourage all users to run the latest, supported version of the software to ensure they are applying the most recent security patches and updates.
+
 ## Reporting a Vulnerability
 
-Use this section to tell people how to report a vulnerability.
+We take the security of our project seriously. If you believe you have found a security vulnerability within our software, we encourage you to report it to us as quickly as possible. We welcome reports from everyone, including security researchers, developers, and our user community.
 
-Tell them where to go, how often they can expect to get an update on a
-reported vulnerability, what to expect if the vulnerability is accepted or
-declined, etc.
+To report a security issue, please send an email to [[email protected]](mailto:[email protected]).