Merge branch 'main' into dependabot/npm_and_yarn/basic-ftp-5.3.0

Author: webstackdev

package-lock.json

@@ -75,14 +75,14 @@
   "dependencies": {
     "@adobe/remark-gridtables": "^3.0.19",
     "@astrojs/check": "0.9.8",
-    "@astrojs/compiler-rs": "0.1.6",
+    "@astrojs/compiler-rs": "0.1.7",
     "@astrojs/db": "^0.20.1",
     "@astrojs/mdx": "5.0.3",
     "@astrojs/preact": "5.1.1",
     "@astrojs/rss": "4.0.18",
     "@astrojs/sitemap": "^3.7.2",
     "@astrojs/vercel": "^10.0.4",
-    "@axe-core/playwright": "^4.11.1",
+    "@axe-core/playwright": "^4.11.2",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.7.1",
     "@eslint/js": "10.0.1",
     "@github/relative-time-element": "^5.0.0",
@@ -96,7 +96,7 @@
     "@playwright/browser-chromium": "^1.59.1",
     "@playwright/test": "1.59.1",
     "@semantic-ui/astro-lit": "^5.3.0",
-    "@sentry/astro": "^10.48.0",
+    "@sentry/astro": "^10.49.0",
     "@sentry/browser": "^10.48.0",
     "@shikijs/transformers": "^4.0.2",
     "@tailwindcss/forms": "0.5.11",
@@ -141,9 +141,9 @@
     "@vitest/coverage-v8": "^4.1.4",
     "@webcomponents/template-shadowroot": "^0.2.1",
     "alex": "^11.0.1",
-    "astro": "6.1.6",
+    "astro": "6.1.8",
     "astro-link-validator": "github:rodgtr1/astro-link-validator",
-    "astro-og-canvas": "^0.11.0",
+    "astro-og-canvas": "^0.11.1",
     "astro-vtbot": "^2.1.12",
     "baseline-browser-mapping": "^2.10.19",
     "canvas-confetti": "^1.9.4",
@@ -156,7 +156,7 @@
     "email-validator": "^2.0.4",
     "embla-carousel": "^8.6.0",
     "embla-carousel-autoplay": "^8.6.0",
-    "eslint": "10.2.0",
+    "eslint": "10.2.1",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-astro": "1.7.0",
     "eslint-plugin-import": "2.32.0",
@@ -184,21 +184,21 @@
     "markdownlint-cli2": "^0.22.0",
     "md-attr-parser": "^1.3.0",
     "mermaid": "^11.14.0",
-    "mjml": "^4.18.0",
-    "nanostores": "^1.2.0",
+    "mjml": "^5.0.1",
+    "nanostores": "^1.3.0",
     "node-html-parser": "^7.1.0",
     "nodemailer": "^8.0.5",
     "npm": "^11.12.1",
     "nunjucks": "^3.2.4",
     "pdf-lib": "^1.17.1",
     "playwright-lighthouse": "^4.0.0",
-    "postcss": "8.5.9",
+    "postcss": "8.5.10",
     "postcss-html": "1.8.1",
     "preact": "^10.29.1",
-    "prettier": "3.8.2",
+    "prettier": "3.8.3",
     "prettier-plugin-astro": "0.14.1",
     "pubsub-js": "^1.9.5",
-    "puppeteer": "^24.40.0",
+    "puppeteer": "^24.41.0",
     "qr-code-styling": "^1.9.2",
     "rehype-accessible-emojis": "^0.3.2",
     "rehype-external-links": "^3.0.0",
@@ -223,7 +223,7 @@
     "remark-stringify": "^11.0.0",
     "remark-supersub": "^1.0.0",
     "remark-video": "^0.10.0",
-    "resend": "^6.11.0",
+    "resend": "^6.12.0",
     "retext": "^9.0.0",
     "retext-smartypants": "^6.2.0",
     "rimraf": "6.1.3",
@@ -232,7 +232,7 @@
     "sharp": "^0.34.5",
     "shiki": "^4.0.2",
     "space-separated-tokens": "^2.0.2",
-    "stylelint": "^17.7.0",
+    "stylelint": "^17.8.0",
     "stylelint-config-standard": "^40.0.0",
     "stylelint-declaration-block-no-ignored-properties": "3.0.0",
     "stylelint-order": "8.1.1",
@@ -242,15 +242,15 @@
     "title-case": "4.3.2",
     "to-ico": "1.1.5",
     "tslib": "2.8.1",
-    "typescript": "6.0.2",
+    "typescript": "6.0.3",
     "typescript-eslint": "8.58.2",
     "unified": "^11.0.5",
     "unist": "^0.0.1",
     "unist-util-inspect": "^8.1.0",
     "unist-util-is": "^6.0.1",
     "unist-util-visit": "^5.1.0",
     "uuid": "^13.0.0",
-    "vercel": "^51.2.1",
+    "vercel": "^51.7.0",
     "vite": "^7.3.2",
     "vitest": "4.1.4",
     "vitest-axe": "0.1.0",

package.json

@@ -19,7 +19,9 @@
         <mj-text>
           {{ htmlMessage | safe }}
         </mj-text>
-        <mj-include path="./partials/footer.mjml" />
+        <mj-text font-size="14px" color="#666666" padding-top="16px">
+          View the <a href="https://example.com/privacy">privacy policy</a>.
+        </mj-text>
       </mj-column>
     </mj-section>
   </mj-body>

src/actions/utils/email/__fixtures__/example.mjml

@@ -1,12 +1,15 @@
-{% import "./partials/footer-macro.mjml" as footer %}
-
 <mjml>
   <mj-body>
     <mj-section>
       <mj-column>
         <mj-text>Hello, {{ name }}!</mj-text>
-        {{ footer.renderFooter(common.company.websiteLabel, common.company.url) }}
-        {% include "./partials/common-contact.mjml" %}
+        <mj-text>
+          Visit <a href="{{ common.company.url }}">{{ common.company.websiteLabel }}</a>.
+        </mj-text>
+        <mj-text>
+          Contact {{ common.company.name }} at
+          <a href="{{ common.company.emailHref }}">{{ common.company.email }}</a>.
+        </mj-text>
       </mj-column>
     </mj-section>
   </mj-body>

src/actions/utils/email/__fixtures__/partials/common-contact.mjml

@@ -54,7 +54,7 @@ describe('compileEmailTemplate', () => {
     expect(result.text).toContain('brief.pdf (2.4 MB)')
   })
 
-  it('renders nunjucks data, supports mj-include, and returns html and plain text', async () => {
+  it('renders nunjucks data and returns html and plain text', async () => {
     const result = await compileEmailTemplate(exampleTemplate, {
       htmlMessage: '<strong>Urgent</strong> message body',
       items: ['Coffee Beans', 'Espresso Machine'],
@@ -74,7 +74,7 @@ describe('compileEmailTemplate', () => {
     expect(result.text).toContain('privacy policy')
   })
 
-  it('injects common contact data and resolves relative nunjucks imports', async () => {
+  it('injects common contact data into inline fixture content', async () => {
     const result = await compileEmailTemplate(withCommonDataTemplate, {
       name: 'Alex',
     })