create-m5kdev 0.33.0 → 0.35.0

package/templates/minimal-app/apps/e2e/tests/waitlist.spec.ts.tpl

@@ -1,107 +1,107 @@
-import { expect, test } from "@playwright/test";
-import {
-  clearEmails,
-  emailUrl,
-  getUserState,
-  latestEmail,
-  login,
-  logout,
-  profiles,
-} from "./helpers";
-
-const profile = "waitlist" as const;
-
-test.beforeEach(async ({ request }) => {
-  await clearEmails(request, profile);
-});
-
-test("public waitlist join stores confirmation email", async ({ page, request }) => {
-  const email = `waitlist.${Date.now()}@auth-e2e.local`;
-
-  await page.goto("/signup");
-  await page.locator('input[type="email"]').fill(email);
-  await page.getByRole("button", { name: /join the waitlist/i }).click();
-
-  const confirmation = await latestEmail(request, profile, {
-    to: email,
-    templateId: "waitlist-confirmation",
-  });
-  expect(confirmation.subject).toContain("waitlist");
-
-  const systemNotification = await latestEmail(request, profile, {
-    to: "ops@auth-e2e.local",
-    templateId: "system-waitlist-notification",
-  });
-  expect(systemNotification.props.email).toBe(email);
-});
-
-test("admin waitlist invitation creates a signup link that can be accepted", async ({
-  page,
-  request,
-}) => {
-  const email = `invited.${Date.now()}@auth-e2e.local`;
-
-  await login(page, profiles.waitlist.adminEmail, profiles.waitlist.adminPassword);
-  await page.goto("/admin/waitlist");
-  await page
-    .getByRole("button", { name: /add to waitlist/i })
-    .first()
-    .click();
-  const dialog = page.getByRole("dialog");
-  await dialog.locator('input[type="email"]').fill(email);
-  await dialog.getByRole("button", { name: /^add to waitlist$/i }).click();
-  await expect(page.getByText(email)).toBeVisible();
-  const waitlistRow = page.getByRole("row").filter({ hasText: email });
-  await waitlistRow.getByLabel("Waitlist row actions").first().click();
-  await page.getByRole("menuitem", { name: /send invitation/i }).click();
-
-  const invite = await latestEmail(request, profile, { to: email, templateId: "waitlist-invite" });
-
-  await logout(page);
-  await page.goto(emailUrl(invite));
-  await page.locator('[name="signup-password"]').fill("password1234");
-  await page.getByRole("button", { name: /sign up/i }).click();
-  await expect(page.getByTestId("session-email")).toContainText(email);
-
-  const state = await getUserState(request, profile, email);
-  expect(state.user.emailVerified).toBe(true);
-  expect(state.organizations).toHaveLength(1);
-
-  await logout(page);
-  await page.goto(emailUrl(invite));
-  await expect(page.getByText(/invalid|expired|invitation code not found/i)).toBeVisible();
-});
-
-test("signed-in user invite skips the waitlist", async ({ page, request }) => {
-  const email = `friend.${Date.now()}@auth-e2e.local`;
-
-  await login(page, profiles.waitlist.adminEmail, profiles.waitlist.adminPassword);
-  await page.goto("/user/invite");
-  await page.locator('input[type="email"]').fill(email);
-  await page.getByRole("button", { name: /send invitation/i }).click();
-
-  const invite = await latestEmail(request, profile, {
-    to: email,
-    templateId: "waitlist-user-invite",
-  });
-
-  await logout(page);
-  await page.goto(emailUrl(invite));
-  await page.locator('[name="signup-password"]').fill("password1234");
-  await page.getByRole("button", { name: /sign up/i }).click();
-  await expect(page.getByTestId("session-email")).toContainText(email);
-
-  const state = await getUserState(request, profile, email);
-  expect(state.user.emailVerified).toBe(true);
-  expect(state.organizations).toHaveLength(1);
-});
-
-test("expired waitlist codes are rejected before signup", async ({ page }) => {
-  await page.goto("/signup?code=expired-waitlist-code");
-  await expect(page.getByText(/expired/i)).toBeVisible();
-});
-
-test("unknown waitlist codes are rejected before signup", async ({ page }) => {
-  await page.goto("/signup?code=unknown-waitlist-code");
-  await expect(page.getByText(/invalid|expired|invitation code not found/i)).toBeVisible();
-});
+import { expect, test } from "@playwright/test";
+import {
+  clearEmails,
+  emailUrl,
+  getUserState,
+  latestEmail,
+  login,
+  logout,
+  profiles,
+} from "./helpers";
+
+const profile = "waitlist" as const;
+
+test.beforeEach(async ({ request }) => {
+  await clearEmails(request, profile);
+});
+
+test("public waitlist join stores confirmation email", async ({ page, request }) => {
+  const email = `waitlist.${Date.now()}@auth-e2e.local`;
+
+  await page.goto("/signup");
+  await page.locator('input[type="email"]').fill(email);
+  await page.getByRole("button", { name: /join the waitlist/i }).click();
+
+  const confirmation = await latestEmail(request, profile, {
+    to: email,
+    templateId: "waitlist-confirmation",
+  });
+  expect(confirmation.subject).toContain("waitlist");
+
+  const systemNotification = await latestEmail(request, profile, {
+    to: "ops@auth-e2e.local",
+    templateId: "system-waitlist-notification",
+  });
+  expect(systemNotification.props.email).toBe(email);
+});
+
+test("admin waitlist invitation creates a signup link that can be accepted", async ({
+  page,
+  request,
+}) => {
+  const email = `invited.${Date.now()}@auth-e2e.local`;
+
+  await login(page, profiles.waitlist.adminEmail, profiles.waitlist.adminPassword);
+  await page.goto("/admin/waitlist");
+  await page
+    .getByRole("button", { name: /add to waitlist/i })
+    .first()
+    .click();
+  const dialog = page.getByRole("dialog");
+  await dialog.locator('input[type="email"]').fill(email);
+  await dialog.getByRole("button", { name: /^add to waitlist$/i }).click();
+  await expect(page.getByText(email)).toBeVisible();
+  const waitlistRow = page.getByRole("row").filter({ hasText: email });
+  await waitlistRow.getByLabel("Waitlist row actions").first().click();
+  await page.getByRole("menuitem", { name: /send invitation/i }).click();
+
+  const invite = await latestEmail(request, profile, { to: email, templateId: "waitlist-invite" });
+
+  await logout(page);
+  await page.goto(emailUrl(invite));
+  await page.locator('[name="signup-password"]').fill("password1234");
+  await page.getByRole("button", { name: /sign up/i }).click();
+  await expect(page.getByTestId("session-email")).toContainText(email);
+
+  const state = await getUserState(request, profile, email);
+  expect(state.user.emailVerified).toBe(true);
+  expect(state.organizations).toHaveLength(1);
+
+  await logout(page);
+  await page.goto(emailUrl(invite));
+  await expect(page.getByText(/invalid|expired|invitation code not found/i)).toBeVisible();
+});
+
+test("signed-in user invite skips the waitlist", async ({ page, request }) => {
+  const email = `friend.${Date.now()}@auth-e2e.local`;
+
+  await login(page, profiles.waitlist.adminEmail, profiles.waitlist.adminPassword);
+  await page.goto("/user/invite");
+  await page.locator('input[type="email"]').fill(email);
+  await page.getByRole("button", { name: /send invitation/i }).click();
+
+  const invite = await latestEmail(request, profile, {
+    to: email,
+    templateId: "waitlist-user-invite",
+  });
+
+  await logout(page);
+  await page.goto(emailUrl(invite));
+  await page.locator('[name="signup-password"]').fill("password1234");
+  await page.getByRole("button", { name: /sign up/i }).click();
+  await expect(page.getByTestId("session-email")).toContainText(email);
+
+  const state = await getUserState(request, profile, email);
+  expect(state.user.emailVerified).toBe(true);
+  expect(state.organizations).toHaveLength(1);
+});
+
+test("expired waitlist codes are rejected before signup", async ({ page }) => {
+  await page.goto("/signup?code=expired-waitlist-code");
+  await expect(page.getByText(/expired/i)).toBeVisible();
+});
+
+test("unknown waitlist codes are rejected before signup", async ({ page }) => {
+  await page.goto("/signup?code=unknown-waitlist-code");
+  await expect(page.getByText(/invalid|expired|invitation code not found/i)).toBeVisible();
+});

package/templates/minimal-app/apps/e2e/tests/workflow.spec.ts.tpl

@@ -0,0 +1,26 @@
+import { expect, test } from "@playwright/test";
+import { clearEmails, login, signUp, verifyLatestEmail } from "./helpers";
+
+const profile = "standard" as const;
+
+test.beforeEach(async ({ request }) => {
+  await clearEmails(request, profile);
+});
+
+test("trigger a demo workflow and observe it complete", async ({ page, request }) => {
+  const email = `workflow.${Date.now()}@auth-e2e.local`;
+  const password = "password1234";
+
+  await signUp(page, email, password);
+  await verifyLatestEmail(request, profile, email);
+  await login(page, email, password);
+
+  await page.goto("/workflows");
+  await expect(page.getByTestId("workflows-route")).toBeVisible();
+
+  await page.getByTestId("workflow-trigger").click();
+  await expect(page.getByTestId("workflow-run").first()).toBeVisible();
+  await expect(page.getByTestId("workflow-run-status").first()).toHaveText(/completed/i, {
+    timeout: 20_000,
+  });
+});

package/templates/minimal-app/apps/e2e/tsconfig.json.tpl

@@ -1,10 +1,10 @@
-{
-  "extends": "@m5kdev/config/tsconfig.node.json",
-  "compilerOptions": {
-    "rootDir": ".",
-    "noEmit": true,
-    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
-  },
-  "exclude": ["dist", "node_modules", "test-results", "playwright-report"],
-  "include": ["playwright.config.ts", "playwright.expo.config.ts", "servers.ts", "tests/**/*.ts"]
-}
+{
+  "extends": "@m5kdev/config/tsconfig.node.json",
+  "compilerOptions": {
+    "rootDir": ".",
+    "noEmit": true,
+    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
+  },
+  "exclude": ["dist", "node_modules", "test-results", "playwright-report"],
+  "include": ["playwright.config.ts", "playwright.expo.config.ts", "servers.ts", "tests/**/*.ts"]
+}

package/templates/minimal-app/apps/email/package.json.tpl

@@ -1,34 +1,34 @@
-{
-  "name": "{{PACKAGE_SCOPE}}/email",
-  "version": "0.0.0",
-  "private": true,
-  "scripts": {
-    "build": "tsc --noEmit",
-    "lint": "biome check .",
-    "lint:fix": "biome check . --write",
-    "check-types": "tsc --noEmit",
-    "email:dev": "react-email dev --dir src/emails"
-  },
-  "dependencies": {
-    "@m5kdev/commons": "catalog:m5kdev",
-    "@m5kdev/email": "catalog:m5kdev",
-    "@react-email/components": "catalog:m5kdev",
-    "react": "catalog:m5kdev",
-    "react-dom": "catalog:m5kdev"
-  },
-  "devDependencies": {
-    "@m5kdev/backend": "catalog:m5kdev",
-    "@m5kdev/config": "catalog:m5kdev",
-    "@types/node": "catalog:m5kdev",
-    "@types/react": "catalog:m5kdev",
-    "@types/react-dom": "catalog:m5kdev",
-    "react-email": "catalog:m5kdev",
-    "tslib": "catalog:m5kdev",
-    "typescript": "catalog:m5kdev"
-  },
-  "main": "./src/index.ts",
-  "exports": {
-    ".": "./src/index.ts",
-    "./resources": "./src/resources.ts"
-  }
-}
+{
+  "name": "{{PACKAGE_SCOPE}}/email",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "build": "tsc --noEmit",
+    "lint": "biome check .",
+    "lint:fix": "biome check . --write",
+    "check-types": "tsc --noEmit",
+    "email:dev": "react-email dev --dir src/emails"
+  },
+  "dependencies": {
+    "@m5kdev/commons": "catalog:m5kdev",
+    "@m5kdev/email": "catalog:m5kdev",
+    "@react-email/components": "catalog:m5kdev",
+    "react": "catalog:m5kdev",
+    "react-dom": "catalog:m5kdev"
+  },
+  "devDependencies": {
+    "@m5kdev/backend": "catalog:m5kdev",
+    "@m5kdev/config": "catalog:m5kdev",
+    "@types/node": "catalog:m5kdev",
+    "@types/react": "catalog:m5kdev",
+    "@types/react-dom": "catalog:m5kdev",
+    "react-email": "catalog:m5kdev",
+    "tslib": "catalog:m5kdev",
+    "typescript": "catalog:m5kdev"
+  },
+  "main": "./src/index.ts",
+  "exports": {
+    ".": "./src/index.ts",
+    "./resources": "./src/resources.ts"
+  }
+}

package/templates/minimal-app/apps/email/src/emails/trialEndingEmail.tsx.tpl

@@ -0,0 +1,40 @@
+/** @jsxRuntime automatic */
+
+import { CtaButton } from "@m5kdev/email/components/CtaButton";
+import { EmailLayout } from "@m5kdev/email/components/EmailLayout";
+import type { Brand, EmailTranslateFn } from "@m5kdev/email/types";
+import { Heading, Text } from "@react-email/components";
+
+function resolveT(t?: EmailTranslateFn): EmailTranslateFn {
+  return t ?? ((key: string) => key);
+}
+
+export default function TrialEndingEmail({
+  previewText,
+  url,
+  trialEnd,
+  brand,
+  t,
+  htmlLang,
+}: {
+  previewText: string;
+  url: string;
+  trialEnd?: string;
+  brand: Brand;
+  t?: EmailTranslateFn;
+  htmlLang?: string;
+}) {
+  const translate = resolveT(t);
+
+  return (
+    <EmailLayout previewText={previewText} brand={brand} htmlLang={htmlLang}>
+      <Heading className="mb-4 text-2xl font-bold text-black">
+        {translate("trialEnding.title")}
+      </Heading>
+      <Text className="mb-6 text-base text-gray-700">
+        {translate("trialEnding.body", { trialEnd })}
+      </Text>
+      <CtaButton href={url}>{translate("trialEnding.action")}</CtaButton>
+    </EmailLayout>
+  );
+}

package/templates/minimal-app/apps/email/src/index.ts.tpl

@@ -2,6 +2,7 @@ import type { FunctionComponent } from "react";
 import AccountDeletionEmail from "./emails/accountDeletionEmail";
 import OrganizationInviteEmail from "./emails/organizationInviteEmail";
 import PasswordResetEmail from "./emails/passwordResetEmail";
+import TrialEndingEmail from "./emails/trialEndingEmail";
 import VerificationEmail from "./emails/verificationEmail";
 import {
   SystemWaitlistNotificationEmail,
@@ -41,6 +42,12 @@ export const templates = {
     previewText: "verification.previewText",
     react: asTemplate(VerificationEmail),
   },
+  trialEnding: {
+    id: "trial-ending",
+    subject: "trialEnding.subject",
+    previewText: "trialEnding.previewText",
+    react: asTemplate(TrialEndingEmail),
+  },
   organizationInvite: {
     id: "organization-invite",
     subject: "organizationInvite.subject",

package/templates/minimal-app/apps/email/src/resources.ts.tpl

@@ -1,65 +1,72 @@
-import type { BackendAppI18nResources } from "@m5kdev/backend/i18n/app-i18n";
-
-export const emailResources = {
-  en: {
-    translation: {
-      verification: {
-        subject: "Verify your email",
-        previewText: "Verify your email address",
-        title: "Verify your email",
-        body: "Confirm your email address to finish setting up {{APP_NAME}} and access your editorial workspace.",
-        action: "Verify account",
-      },
-      passwordReset: {
-        subject: "Reset your password",
-        previewText: "Reset your password request",
-        title: "Reset your password",
-        body: "Use this link to choose a new password for your account.",
-        action: "Reset password",
-      },
-      accountDeletion: {
-        subject: "Delete your account",
-        previewText: "Confirm your account deletion",
-        title: "Confirm account deletion",
-        body: "Use this link to confirm deleting your account.",
-        action: "Confirm deletion",
-      },
-      organizationInvite: {
-        subject: "Join the organization",
-        previewText: "You have been invited to join an organization",
-        title: "Join {{organizationName}}",
-        body: "{{inviterName}} invited you to join {{organizationName}} as {{role}}.",
-        action: "Accept invitation",
-      },
-      waitlistConfirmation: {
-        subject: "You joined the waitlist",
-        previewText: "Your waitlist request was recorded",
-        title: "You joined the waitlist",
-        body: "Your waitlist request was recorded. We will let you know as soon as a spot opens up.",
-        action: "Open app",
-      },
-      waitlistInvite: {
-        subject: "Your invitation is ready",
-        previewText: "Create your account",
-        title: "Your invitation is ready",
-        body: "Use this invitation link to create your account.",
-        action: "Create account",
-      },
-      waitlistUserInvite: {
-        subject: "{{inviter}} invited you to join {{brandName}}",
-        previewText: "Create your {{brandName}} account today",
-        title: "{{inviter}} invited you{{invitee}}",
-        body: "This invite lets you skip the waitlist and create your account now.",
-        action: "Accept invite",
-        inviteeSuffix: " for {{name}}",
-      },
-      systemWaitlistNotification: {
-        subject: "New waitlist signup",
-        previewText: "A user joined the waitlist",
-        title: "New waitlist signup",
-        body: "A user joined the {{APP_NAME}} waitlist.",
-        action: "Open admin",
-      },
-    },
-  },
-} satisfies BackendAppI18nResources;
+import type { BackendAppI18nResources } from "@m5kdev/backend/i18n/app-i18n";
+
+export const emailResources = {
+  en: {
+    translation: {
+      verification: {
+        subject: "Verify your email",
+        previewText: "Verify your email address",
+        title: "Verify your email",
+        body: "Confirm your email address to finish setting up {{APP_NAME}} and access your editorial workspace.",
+        action: "Verify account",
+      },
+      passwordReset: {
+        subject: "Reset your password",
+        previewText: "Reset your password request",
+        title: "Reset your password",
+        body: "Use this link to choose a new password for your account.",
+        action: "Reset password",
+      },
+      trialEnding: {
+        subject: "Your trial ends soon",
+        previewText: "Add a payment method to keep your subscription",
+        title: "Your trial is ending",
+        body: "Your trial ends on {{trialEnd}}. Without a payment method, your subscription will be canceled.",
+        action: "Add a payment method",
+      },
+      accountDeletion: {
+        subject: "Delete your account",
+        previewText: "Confirm your account deletion",
+        title: "Confirm account deletion",
+        body: "Use this link to confirm deleting your account.",
+        action: "Confirm deletion",
+      },
+      organizationInvite: {
+        subject: "Join the organization",
+        previewText: "You have been invited to join an organization",
+        title: "Join {{organizationName}}",
+        body: "{{inviterName}} invited you to join {{organizationName}} as {{role}}.",
+        action: "Accept invitation",
+      },
+      waitlistConfirmation: {
+        subject: "You joined the waitlist",
+        previewText: "Your waitlist request was recorded",
+        title: "You joined the waitlist",
+        body: "Your waitlist request was recorded. We will let you know as soon as a spot opens up.",
+        action: "Open app",
+      },
+      waitlistInvite: {
+        subject: "Your invitation is ready",
+        previewText: "Create your account",
+        title: "Your invitation is ready",
+        body: "Use this invitation link to create your account.",
+        action: "Create account",
+      },
+      waitlistUserInvite: {
+        subject: "{{inviter}} invited you to join {{brandName}}",
+        previewText: "Create your {{brandName}} account today",
+        title: "{{inviter}} invited you{{invitee}}",
+        body: "This invite lets you skip the waitlist and create your account now.",
+        action: "Accept invite",
+        inviteeSuffix: " for {{name}}",
+      },
+      systemWaitlistNotification: {
+        subject: "New waitlist signup",
+        previewText: "A user joined the waitlist",
+        title: "New waitlist signup",
+        body: "A user joined the {{APP_NAME}} waitlist.",
+        action: "Open admin",
+      },
+    },
+  },
+} satisfies BackendAppI18nResources;

package/templates/minimal-app/apps/expo/app.json.tpl

@@ -1,36 +1,36 @@
-{
-  "expo": {
-    "name": "Auth E2E Expo",
-    "slug": "auth-e2e-expo",
-    "version": "1.0.0",
-    "orientation": "portrait",
-    "icon": "./assets/images/icon.png",
-    "scheme": "auth-e2e-expo",
-    "userInterfaceStyle": "automatic",
-    "ios": {
-      "supportsTablet": true
-    },
-    "android": {
-      "adaptiveIcon": {
-        "foregroundImage": "./assets/images/adaptive-icon.png",
-        "backgroundColor": "#ffffff"
-      },
-      "predictiveBackGestureEnabled": false
-    },
-    "plugins": [
-      "expo-router",
-      [
-        "expo-splash-screen",
-        {
-          "image": "./assets/images/splash-icon.png",
-          "resizeMode": "contain",
-          "backgroundColor": "#ffffff"
-        }
-      ]
-    ],
-    "experiments": {
-      "typedRoutes": true,
-      "reactCompiler": true
-    }
-  }
-}
+{
+  "expo": {
+    "name": "Auth E2E Expo",
+    "slug": "auth-e2e-expo",
+    "version": "1.0.0",
+    "orientation": "portrait",
+    "icon": "./assets/images/icon.png",
+    "scheme": "auth-e2e-expo",
+    "userInterfaceStyle": "automatic",
+    "ios": {
+      "supportsTablet": true
+    },
+    "android": {
+      "adaptiveIcon": {
+        "foregroundImage": "./assets/images/adaptive-icon.png",
+        "backgroundColor": "#ffffff"
+      },
+      "predictiveBackGestureEnabled": false
+    },
+    "plugins": [
+      "expo-router",
+      [
+        "expo-splash-screen",
+        {
+          "image": "./assets/images/splash-icon.png",
+          "resizeMode": "contain",
+          "backgroundColor": "#ffffff"
+        }
+      ]
+    ],
+    "experiments": {
+      "typedRoutes": true,
+      "reactCompiler": true
+    }
+  }
+}

package/templates/minimal-app/apps/expo/eslint.config.js.tpl

@@ -1,8 +1,8 @@
-const expoConfig = require("eslint-config-expo/flat");
-
-module.exports = [
-  ...expoConfig,
-  {
-    ignores: ["dist/*", ".expo/*", "node_modules/*", "expo-env.d.ts", "uniwind-types.d.ts"],
-  },
-];
+const expoConfig = require("eslint-config-expo/flat");
+
+module.exports = [
+  ...expoConfig,
+  {
+    ignores: ["dist/*", ".expo/*", "node_modules/*", "expo-env.d.ts", "uniwind-types.d.ts"],
+  },
+];