Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

misc(root): Add support for Docker install #1571

Open
wants to merge 15 commits into
base: canary
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/dry-humans-return.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"react-email": patch
---

update socket.io/socket.io-client to 4.7.5
27 changes: 27 additions & 0 deletions .changeset/fast-countries-marry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
"create-email": patch
"@react-email/code-inline": patch
"react-email": patch
"@react-email/code-block": patch
"@react-email/components": patch
"@react-email/container": patch
"@react-email/markdown": patch
"@react-email/tailwind": patch
"@react-email/heading": patch
"@react-email/preview": patch
"@react-email/section": patch
"@react-email/button": patch
"@react-email/column": patch
"@react-email/render": patch
"@react-email/body": patch
"@react-email/font": patch
"@react-email/head": patch
"@react-email/html": patch
"@react-email/link": patch
"@react-email/text": patch
"@react-email/img": patch
"@react-email/row": patch
"@react-email/hr": patch
---

Updated peer dependencies to allow for React 19 release candidated and React 19 itself
5 changes: 5 additions & 0 deletions .changeset/new-coats-cover.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"react-email": patch
---

Fixes tooltip color being black for specific theming configurations
5 changes: 5 additions & 0 deletions .changeset/odd-bobcats-know.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@react-email/button": patch
---

Add missing `msoPaddingAlt` to containing `<a>` tag
41 changes: 41 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"mode": "pre",
"tag": "canary",
"initialVersions": {
"demo": "0.0.0",
"web": "0.0.0",
"@benchmarks/tailwind-component": "0.0.0",
"@react-email/body": "0.0.9",
"@react-email/button": "0.0.16",
"@react-email/code-block": "0.0.6",
"@react-email/code-inline": "0.0.3",
"@react-email/column": "0.0.11",
"@react-email/components": "0.0.22",
"@react-email/container": "0.0.13",
"create-email": "0.0.30",
"react-email-starter": "0.0.30",
"eslint-config-custom": "0.0.0",
"@react-email/font": "0.0.7",
"@react-email/head": "0.0.10",
"@react-email/heading": "0.0.13",
"@react-email/hr": "0.0.9",
"@react-email/html": "0.0.9",
"@react-email/img": "0.0.9",
"@react-email/link": "0.0.9",
"@react-email/markdown": "0.0.11",
"@react-email/preview": "0.0.10",
"react-email": "2.1.6",
"@react-email/render": "0.0.17",
"@react-email/row": "0.0.9",
"@react-email/section": "0.0.13",
"@react-email/tailwind": "0.0.19",
"@react-email/text": "0.0.9",
"tsconfig": "0.0.0"
},
"changesets": [
"dry-humans-return",
"fast-countries-marry",
"odd-bobcats-know",
"wild-mugs-kick"
]
}
5 changes: 5 additions & 0 deletions .changeset/wild-mugs-kick.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"react-email-starter": patch
---

add react-dom as a template dependency as well
6 changes: 3 additions & 3 deletions .github/workflows/bump-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ jobs:
run: pnpm install --frozen-lockfile

- name: Enter prerelease mode
run: |
changeset pre enter canary 2>/dev/null || true
continue-on-error: true
run: pnpm canary:enter

- name: Create Release Pull Request
uses: changesets/action@v1
with:
version: pnpm version
version: pnpm run version
title: "chore: Bump for release"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6 changes: 3 additions & 3 deletions .github/workflows/bump-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ jobs:
run: pnpm install --frozen-lockfile

- name: Exit prerelease mode
run: |
changeset pre exit 2>/dev/null || true
continue-on-error: true
run: pnpm canary:exit

- name: Create Release Pull Request
uses: changesets/action@v1
with:
version: pnpm version
version: pnpm run version
title: "chore: Bump for release"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3 changes: 3 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,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);
}

Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ npm install @react-email/components -E
pnpm install @react-email/components -E
```

#### With Docker (Community version)

Follow https://github.com/notleanbarba/react-email-docker

## Getting started

Add the component to your email template. Include styles where needed.
Expand Down
10 changes: 5 additions & 5 deletions apps/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
},
"dependencies": {
"@react-email/components": "workspace:*",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "19.0.0-rc.0",
"react-dom": "19.0.0-rc.0",
"react-email": "workspace:*"
},
"devDependencies": {
"next": "14.1.4",
"@types/react": "18.2.47",
"@types/react-dom": "18.2.18",
"next": "14.2.3",
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"tsx": "4.9.0"
}
}
10 changes: 5 additions & 5 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@
},
"dependencies": {
"@radix-ui/colors": "1.0.1",
"@radix-ui/react-slot": "1.0.2",
"@radix-ui/react-slot": "1.1.0",
"@sindresorhus/is": "6.1.0",
"@supabase/supabase-js": "2.39.3",
"@vercel/analytics": "1.0.1",
"classnames": "2.3.2",
"next": "14.2.3",
"next": "15.0.0-canary.27",
"prism-react-renderer": "2.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "19.0.0-rc.0",
"react-dom": "19.0.0-rc.0",
"resend": "3.2.0"
},
"devDependencies": {
"@next/eslint-plugin-next": "14.2.3",
"autoprefixer": "10.4.14",
"eslint-config-custom": "workspace:*",
"postcss": "8.4.38",
"postcss": "8.4.39",
"tailwindcss": "3.4.3",
"tsconfig": "workspace:*",
"typescript": "5.1.6"
Expand Down
48 changes: 20 additions & 28 deletions apps/web/src/components/heading.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,35 +26,27 @@ interface HeadingOwnProps {

type HeadingProps = As<"h1", "h2", "h3", "h4", "h5", "h6"> & HeadingOwnProps;

export const Heading = React.forwardRef<
HTMLHeadingElement,
Readonly<HeadingProps>
>(
(
{
as: Tag = "h1",
size = "3",
export const Heading = ({
as: Tag = "h1",
size = "3",
className,
color = "white",
children,
weight = "bold",
...props
}: HeadingProps) => (
<SlotPrimitive.Slot
className={classnames(
className,
color = "white",
children,
weight = "bold",
...props
},
forwardedRef,
) => (
<SlotPrimitive.Slot
className={classnames(
className,
getSizesClassNames(size),
getColorClassNames(color),
getWeightClassNames(weight),
)}
ref={forwardedRef}
{...props}
>
<Tag>{children}</Tag>
</SlotPrimitive.Slot>
),
getSizesClassNames(size),
getColorClassNames(color),
getWeightClassNames(weight),
)}
{...props}
ref={props.ref as React.Ref<HTMLElement>}
>
<Tag>{children}</Tag>
</SlotPrimitive.Slot>
);

const getSizesClassNames = (size: HeadingSize | undefined) => {
Expand Down
49 changes: 22 additions & 27 deletions apps/web/src/components/text.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,29 @@ interface TextOwnProps {

type TextProps = As<"span", "div", "p"> & TextOwnProps;

export const Text = React.forwardRef<HTMLSpanElement, Readonly<TextProps>>(
(
{
as: Tag = "span",
size = "2",
color = "gray",
transform,
weight = "normal",
export const Text = ({
as: Tag = "span",
size = "2",
color = "gray",
transform,
weight = "normal",
className,
children,
...props
}: TextProps) => (
<SlotPrimitive.Slot
className={classnames(
className,
children,
...props
},
forwardedRef,
) => (
<SlotPrimitive.Slot
className={classnames(
className,
transform,
getSizesClassNames(size),
getColorClassNames(color),
getWeightClassNames(weight),
)}
ref={forwardedRef}
{...props}
>
<Tag>{children}</Tag>
</SlotPrimitive.Slot>
),
transform,
getSizesClassNames(size),
getColorClassNames(color),
getWeightClassNames(weight),
)}
{...props}
ref={props.ref as React.Ref<HTMLElement>}
>
<Tag>{children}</Tag>
</SlotPrimitive.Slot>
);

const getSizesClassNames = (size: TextSize | undefined) => {
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/tailwind-component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@react-email/components": "workspace:*",
"@react-email/render": "workspace:*",
"@react-email/tailwind": "workspace:*",
"react": "^18.2.0",
"react": "19.0.0-rc.0",
"tailwind-0.0.12": "npm:@react-email/[email protected]",
"tailwind-0.0.15": "npm:@react-email/[email protected]",
"tinybench": "2.5.1"
Expand Down
2 changes: 1 addition & 1 deletion examples/aws-ses/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"dependencies": {
"@aws-sdk/client-ses": "3.341.0",
"@react-email/components": "*",
"react": "^18.2.0"
"react": "19.0.0-rc.0"
},
"devDependencies": {
"tsup": "6.2.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/mailersend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"dependencies": {
"@react-email/components": "*",
"mailersend": "^2.0.0",
"react": "^18.2.0"
"react": "19.0.0-rc.0"
},
"devDependencies": {
"tsup": "6.2.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/nodemailer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"dependencies": {
"@react-email/components": "*",
"nodemailer": "6.9.9",
"react": "^18.2.0"
"react": "19.0.0-rc.0"
},
"devDependencies": {
"tsup": "6.2.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/plunk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"dependencies": {
"@plunk/node": "1.1.1",
"@react-email/components": "*",
"react": "^18.2.0"
"react": "19.0.0-rc.0"
},
"devDependencies": {
"tsup": "6.2.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/postmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"dependencies": {
"@react-email/components": "*",
"postmark": "3.0.14",
"react": "^18.2.0"
"react": "19.0.0-rc.0"
},
"devDependencies": {
"tsup": "6.2.3",
Expand Down
8 changes: 4 additions & 4 deletions examples/resend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
},
"dependencies": {
"next": "13.5.6",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "19.0.0-rc.0",
"react-dom": "19.0.0-rc.0",
"resend": "^3.2.0"
},
"devDependencies": {
"@types/node": "^20.2.5",
"@types/react": "18.2.23",
"@types/react-dom": "18.2.8",
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"typescript": "^5.1.3"
}
}
Loading
Loading