@teleporthq/teleport-plugin-next-workflows 0.44.17 → 0.45.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teleporthq/teleport-plugin-next-workflows",
-  "version": "0.44.17",
+  "version": "0.45.1",
   "description": "A plugin for workflow code generation in Next.js projects.",
   "author": "teleportHQ",
   "license": "MIT",
@@ -66,8 +66,8 @@
   },
   "dependencies": {
     "@babel/types": "^7.5.5",
-    "@teleporthq/teleport-shared": "^0.44.16",
-    "@teleporthq/teleport-types": "^0.44.16"
+    "@teleporthq/teleport-shared": "^0.45.0",
+    "@teleporthq/teleport-types": "^0.45.0"
   },
-  "gitHead": "cc3f4e64c87e23d1ca5650026a0753aeb6272691"
+  "gitHead": "f11bd5551fc54bb06a7d6068924c1e9dedb79860"
 }

package/src/auth-generator.ts

@@ -2297,6 +2297,8 @@ const generateKnownAddressEmailCode = (options: {
   sender: { provider: string | null; from: string; secretEnv: string }
   pagePath: string
   tokenInFragment: boolean
+  /** The route already declares `__emailSender` (the welcome send brings it). */
+  senderHelperDeclared: boolean
 }): string => {
   const { sender } = options
   const senderConstants = `
@@ -2320,10 +2322,11 @@ async function sendSetPasswordEmail() {
   const ttlMinutes = Math.round(PASSWORD_RESET_TOKEN_TTL_SECONDS / 60)
   // Where the link carries the token, as the forgot-password link does.
   const tokenLinkPrefix = options.tokenInFragment ? '#token=' : '?token='
-  const noticeSend = generateProviderSendFunction(sender.provider).replace(
-    'async function __sendProviderEmail(',
-    'async function __sendNoticeEmail('
-  )
+  const noticeSend = generateProviderSendFunction(
+    sender.provider,
+    undefined,
+    !options.senderHelperDeclared
+  ).replace('async function __sendProviderEmail(', 'async function __sendNoticeEmail(')
   return `${senderConstants}
 
 ${noticeSend}
@@ -2537,6 +2540,7 @@ ${generateKnownAddressEmailCode({
   sender: noticeSender,
   pagePath: setPasswordPagePath,
   tokenInFragment: signup.tokenInFragment === true,
+  senderHelperDeclared: !!welcomeProvider,
 })}
 
 function waitUntilElapsed(startedAt, ms) {

package/src/transactional-email-code.ts

@@ -67,16 +67,20 @@ export const EXISTING_ACCOUNT_EMAIL = 'existing-account'
 // is configured the function is a no-op so the route stays self-contained and
 // never throws. With `ledger`, the provider function is emitted as
 // `__sendProviderEmailRaw` and `__sendProviderEmail` records every attempt
-// (success or throw) before returning / rethrowing.
+// (success or throw) before returning / rethrowing. `withSenderHelper: false`
+// leaves the helper out, for a second send in a file that already declares it:
+// Next compiles a route as a module, where a function declared twice fails the
+// build ("the name `__emailSender` is defined multiple times").
 export const generateProviderSendFunction = (
   provider?: string | null,
-  ledger?: TransactionalEmailLedger
+  ledger?: TransactionalEmailLedger,
+  withSenderHelper = true
 ): string => {
   const raw = generateRawProviderSendFunction(provider)
   if (!provider || !SUPPORTED_EMAIL_PROVIDERS.has(provider)) {
     return raw
   }
-  const senderHelper = EmailSender.generateEmailSenderHelperCode()
+  const senderHelper = withSenderHelper ? EmailSender.generateEmailSenderHelperCode() : ''
   if (!ledger) {
     return `${senderHelper}
 ${raw}`