@wasp.sh/wasp-cli-darwin-arm64-unknown 0.24.0 → 0.25.0-rc.1

package/data/Generator/templates/sdk/wasp/client/operations/internal/resources.js

@@ -65,8 +65,10 @@ async function invalidateQueriesUsing(resources) {
   const queryClient = await queryClientInitialized
 
   const queryCacheKeysToInvalidate = getQueriesUsingResources(resources)
-  queryCacheKeysToInvalidate.forEach(
-    queryCacheKey => queryClient.invalidateQueries(queryCacheKey)
+  await Promise.all(
+    queryCacheKeysToInvalidate.map(
+      queryCacheKey => queryClient.invalidateQueries(queryCacheKey)
+    )
   )
 }
 

package/data/Generator/templates/sdk/wasp/client/operations/queries/core.ts

@@ -1,5 +1,5 @@
-import { Route } from 'wasp/client'
-import type { _Awaited, _ReturnType } from 'wasp/universal/types'
+import { Route } from '../../index.js'
+import type { _Awaited, _ReturnType } from '../../../universal/types.js'
 import type {
   GenericBackendOperation,
   GenericOperationRpc,

package/data/Generator/templates/sdk/wasp/client/operations/rpc.ts

@@ -1,9 +1,9 @@
-import { type Route } from "wasp/client";
+import { type Route } from "../index.js";
 import type {
   IfAny,
   _Awaited,
   _ReturnType,
-} from "wasp/universal/types"
+} from "../../universal/types.js"
 
 // PRIVATE API (for SDK, should maybe be public, users define values of this
 // type).

package/data/Generator/templates/sdk/wasp/client/test/vitest/helpers.tsx

@@ -5,10 +5,9 @@ import { BrowserRouter as Router } from 'react-router'
 import { render, RenderResult, cleanup } from '@testing-library/react'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { beforeAll, afterEach, afterAll } from 'vitest'
-import { Query } from 'wasp/client/operations/rpc'
-import { config } from 'wasp/client'
-import { HttpMethod, Route } from 'wasp/client'
-import { serialize } from 'wasp/core/serialization'
+import { Query } from '../../operations/rpc.js'
+import { config, HttpMethod, Route } from '../../index.js'
+import { serialize } from '../../../core/serialization/index.js'
 
 // PRIVATE API
 export type MockQuery = <Input, Output, MockOutput extends Output>(

package/data/Generator/templates/sdk/wasp/client/vite/plugins/validateEnv.ts

@@ -16,18 +16,18 @@ export function validateEnv(): Plugin {
   return {
     name: PLUGIN_NAME,
     configResolved(config) {
-      resolvedConfig = config; 
+      resolvedConfig = config;
     },
     // We validate just before any artifacts are built.
     async buildStart() {
       // We need to import the client env schema validation module
       // through a Vite server, because both the user and the Wasp schema
       // modules may depend on bundler features.
-      // Because of that we spin up a tepomrary Vite server.
+      // Because of that we spin up a temporary Vite server.
       //
       // Alternatively, for `serve`, we could use the Vite server provided
       // through the `configureServer` hook, but that would complicate
-      // the solution for negligible performance benefits. 
+      // the solution for negligible performance benefits.
       const tempServer = await createViteServer({
         root: resolvedConfig.root,
         mode: resolvedConfig.mode,
@@ -36,6 +36,11 @@ export function validateEnv(): Plugin {
         configFile: false,
         plugins: resolvedConfig.plugins
           .filter((plugin) => plugin.name !== PLUGIN_NAME)
+
+          // Ignore `vite:`-prefixed plugins since Vite will recreate them for
+          // the temporary server anyway.
+          .filter((plugin) => !plugin.name.startsWith("vite:"))
+
           // Vite's `configureServer`/`configurePreviewServer` hooks let plugins
           // wire long-lived behavior into a dev or preview server: middleware,
           // websocket handlers, file watchers, and similar background tasks.
@@ -52,12 +57,13 @@ export function validateEnv(): Plugin {
             configureServer: undefined,
             configurePreviewServer: undefined,
           })),
+
         // Minimize side effects from spinning up a temporary dev server.
         appType: 'custom',      // avoid HTML handling
-        server: { 
+        server: {
           middlewareMode: true, // do not start an actual HTTP server
-          watch: null, 
-          hmr: false 
+          watch: null,
+          hmr: false
         },
         logLevel: "silent",
         optimizeDeps: { noDiscovery: true, include: [] },
@@ -66,12 +72,12 @@ export function validateEnv(): Plugin {
 
       try {
         // Vite's `ssr` means bundled for "backend JS runtime", like Node.
-        // This envrionemnt is always runnable in vite dev server.
+        // This environment is always runnable in vite dev server.
         if (!isRunnableDevEnvironment(tempServer.environments.ssr)) {
           throw new Error(`Expected ssr to be a runnable dev environment`)
         }
         // The imported module runs env schema validation as an import
-        // side-effect and throws on failure. 
+        // side-effect and throws on failure.
         const moduleAbsPath = path.resolve(resolvedConfig.root, CLIENT_ENV_SCHEMA_VALIDATION_MODULE);
         await tempServer.environments.ssr.runner.import(moduleAbsPath);
       } finally {

package/data/Generator/templates/sdk/wasp/client/vite/virtual-files/files/client-entry.tsx

@@ -12,23 +12,43 @@ import { WaspApp } from "wasp/client/app";
 const router = createBrowserRouter({= routeObjects.importIdentifier =}, {
   basename: "{= baseDir =}",
   // React Router will put hydration data on this property of the `window` object.
-  // https://reactrouter.com/7.13.1/start/data/custom#4-hydrate-in-the-browser
+  // https://reactrouter.com/8.0.1/start/data/custom#4-hydrate-in-the-browser
   hydrationData: window.__staticRouterHydrationData,
 })
 
 // We embed this data at prerendering time.
 const { isFallbackPage } = window.__WASP_SSR_DATA__ ?? {}
 
-function App() {
-  return (
-    <Layout isFallbackPage={isFallbackPage}>
-      <WaspApp>
-        <RouterProvider router={router} />
-      </WaspApp>
-    </Layout>
-  );
-}
+const routerProviderPromise =
+  waitForRouterInitialized(router).then(() => (
+    <RouterProvider router={router} />
+  ))
+
+const fullAppTree = (
+  <Layout isFallbackPage={isFallbackPage}>
+    <WaspApp>
+      {routerProviderPromise}
+    </WaspApp>
+  </Layout>
+)
 
 startTransition(() => {
-  hydrateRoot(document, <App />);
+  hydrateRoot(document, fullAppTree);
 });
+
+async function waitForRouterInitialized(
+  router: ReturnType<typeof createBrowserRouter>,
+): Promise<void> {
+  if (router.state.initialized) {
+    return;
+  }
+
+  return new Promise((resolve) => {
+    const unsubscribe = router.subscribe(() => {
+      if (router.state.initialized) {
+        unsubscribe();
+        resolve();
+      }
+    });
+  });
+}

package/data/Generator/templates/sdk/wasp/client/vite/virtual-files/files/routes.tsx

@@ -1,7 +1,9 @@
 {{={= =}=}}
 import { getRouteObjects } from "wasp/client/app/router";
 import { initializeQueryClient } from "wasp/client/operations";
-import { lazy } from "react"
+{=^ rootComponent.isDefined =}
+import { Outlet } from "react-router"
+{=/ rootComponent.isDefined =}
 
 {=# isAuthEnabled =}
 import { createAuthRequiredPage } from "wasp/client/app"
@@ -25,19 +27,19 @@ const routesMapping = {
   {=# routes =}
   {=# isLazy =}
   {= name =}: {
-    Component:
-      {=! We use React's `lazy()` instead of defining a Lazy Route on React =}
-      {=! Router's side because there's a bug where it will ask for a =}
-      {=! HydrationFallback and commit it immediately even when working with =}
-      {=! prerendered pages. =}
-      {=! https://github.com/remix-run/react-router/issues/14955 =}
-      lazy(() =>
-        {=& import.dynamicImportExpression =}
-        {=# isAuthRequired =}
-        .then(component => createAuthRequiredPage(component))
-        {=/ isAuthRequired =}
-        .then(component => ({ default: component }))
-      ),
+    lazy: async () => {
+      const Component = await {=& import.dynamicImportExpression =};
+
+      return {
+        Component:
+          {=# isAuthRequired =}
+          createAuthRequiredPage(Component),
+          {=/ isAuthRequired =}
+          {=^ isAuthRequired =}
+          Component,
+          {=/ isAuthRequired =}
+      }
+    },
   },
   {=/ isLazy =}
   {=^ isLazy =}
@@ -60,12 +62,16 @@ await {= setupFn.importIdentifier =}()
 initializeQueryClient()
 
 const rootElement =
-  {=# rootComponent.isDefined =}
-  <{= rootComponent.importIdentifier =} />
-  {=/ rootComponent.isDefined =}
-  {=^ rootComponent.isDefined =}
-  undefined
-  {=/ rootComponent.isDefined =}
+  // We don't really need to wrap the app in a div nor name it "root", but we
+  // keep it for backwards compatibility with older Wasp versions.
+  <div id="root">
+    {=# rootComponent.isDefined =}
+    <{= rootComponent.importIdentifier =} />
+    {=/ rootComponent.isDefined =}
+    {=^ rootComponent.isDefined =}
+    <Outlet />
+    {=/ rootComponent.isDefined =}
+  </div>
 
 export const routeObjects = getRouteObjects({
   routesMapping,

package/data/Generator/templates/sdk/wasp/client/vite/virtual-files/files/ssr-entry.tsx

@@ -6,7 +6,7 @@ import { prerenderToNodeStream as reactPrerender } from "react-dom/static";
 import {
   createStaticHandler,
   createStaticRouter,
-  RouterProvider,
+  StaticRouterProvider,
 } from "react-router";
 
 import { Layout } from "wasp/client/app/layout";
@@ -17,34 +17,21 @@ import { WaspApp } from "wasp/client/app";
 const SPA_FALLBACK_FILE = "{= spaFallbackFile =}";
 
 const prerenderApp: PrerenderFn = async (route, { clientEntrySrc }) => {
-  const { query, dataRoutes } = createStaticHandler({= routeObjects.importIdentifier =}, {
-    basename: "{= baseDir =}",
-  });
-
-  const req = new Request(new URL(route, "http://localhost"));
-
-  const context = await query(req);
-  assert(
-    !(context instanceof Response),
-    "Redirects from React Router's `loader`s are not supported",
-  );
-
-  const router = createStaticRouter(dataRoutes, context);
   const isFallbackPage = route === SPA_FALLBACK_FILE;
 
-  function App() {
-    return (
-      <Layout isFallbackPage={isFallbackPage} clientEntrySrc={clientEntrySrc}>
-        <WaspApp>
-          <RouterProvider router={router} />
-        </WaspApp>
-      </Layout>
-    )
-  }
+  const staticRouterProvider = isFallbackPage ? undefined : (await makeStaticRouterProvider(route));
+
+  const fullAppTree = (
+    <Layout isFallbackPage={isFallbackPage} clientEntrySrc={clientEntrySrc}>
+      <WaspApp>
+        {staticRouterProvider}
+      </WaspApp>
+    </Layout>
+  )
 
   const WASP_SSR_DATA: WaspSSRData = { isFallbackPage }
 
-  const html = await reactPrerender(<App/>, {
+  const html = await reactPrerender(fullAppTree, {
     bootstrapScriptContent: `window.__WASP_SSR_DATA__=${JSON.stringify(WASP_SSR_DATA)};`,
   })
     .then((result) => streamConsumers.text(result.prelude))
@@ -53,3 +40,21 @@ const prerenderApp: PrerenderFn = async (route, { clientEntrySrc }) => {
 }
 
 export default prerenderApp;
+
+const { query, dataRoutes } = createStaticHandler({= routeObjects.importIdentifier =}, {
+  basename: "{= baseDir =}",
+});
+
+async function makeStaticRouterProvider(route: string) {
+  const req = new Request(new URL(route, "http://localhost"));
+
+  const context = await query(req);
+  assert(
+    !(context instanceof Response),
+    "Redirects from React Router's `loader`s are not supported",
+  );
+
+  const router = createStaticRouter(dataRoutes, context);
+
+  return <StaticRouterProvider router={router} context={context} />;
+}

package/data/Generator/templates/sdk/wasp/client/vite/virtual-files/resolver.ts

@@ -1,4 +1,4 @@
-import * as path from "node:path";
+import * as path from "node:path"
 
 export type VirtualFiles = {
   ids: ReadonlyMap<string, string>;
@@ -18,11 +18,18 @@ export const makeVirtualFilesResolver =
       absPath: path.resolve(rootPath, path.basename(d.id)),
     }));
 
-    const ids = new Map(filesWithAbsPath.map((d) => [d.id, d.absPath]));
-
-    const loaders = new Map(
-      filesWithAbsPath.map((d) => [d.absPath, d.load]),
+    const ids = new Map(
+      filesWithAbsPath.flatMap((d) =>
+        // We'll resolve both the relative and absolute paths for the virtual
+        // files, since Vite and other plugins may request either.
+        [
+          [d.id, d.absPath],
+          [d.absPath, d.absPath],
+        ],
+      ),
     );
 
+    const loaders = new Map(filesWithAbsPath.map((d) => [d.absPath, d.load]));
+
     return { ids, loaders };
   };

package/data/Generator/templates/sdk/wasp/client/webSocket/WebSocketProvider.tsx

@@ -2,11 +2,11 @@
 import { createContext, useState, useEffect, Context, ReactNode } from 'react'
 import { io, Socket } from 'socket.io-client'
 
-import { getSessionId } from 'wasp/client/api'
-import { apiEventsEmitter } from 'wasp/api/events'
-import { config } from 'wasp/client'
+import { getSessionId } from '../../api/index.js'
+import { apiEventsEmitter } from '../../api/events.js'
+import { config } from '../index.js'
 
-import type { ClientToServerEvents, ServerToClientEvents } from 'wasp/server/webSocket';
+import type { ClientToServerEvents, ServerToClientEvents } from '../../server/webSocket/index.js';
 
 export type WebSocketContextValue = {
   socket: typeof socket

package/data/Generator/templates/sdk/wasp/client/webSocket/index.ts

@@ -3,7 +3,7 @@ import { WebSocketContext, WebSocketContextValue } from './WebSocketProvider'
 import type {
   ClientToServerEvents,
   ServerToClientEvents,
-} from 'wasp/server/webSocket'
+} from '../../server/webSocket/index.js'
 
 // PUBLIC API
 export type ServerToClientPayload<Event extends keyof ServerToClientEvents> =

package/data/Generator/templates/sdk/wasp/core/auth.ts

@@ -1,6 +1,6 @@
-import { getSessionAndUserFromBearerToken } from 'wasp/auth/session'
-import { createInvalidCredentialsError } from 'wasp/auth/utils'
-import { defineHandler } from 'wasp/server/utils'
+import { getSessionAndUserFromBearerToken } from '../auth/session.js'
+import { createInvalidCredentialsError } from '../auth/utils.js'
+import { defineHandler } from '../server/utils.js'
 
 /**
  * Auth middleware

package/data/Generator/templates/sdk/wasp/env/validation.ts

@@ -1,6 +1,6 @@
 import * as z from "zod";
 
-import { colorize } from "wasp/universal/ansiColors";
+import { colorize } from "../universal/ansiColors.js";
 
 // PRIVATE API (SDK)
 export function ensureEnvSchema<Schema extends z.ZodType>(

package/data/Generator/templates/sdk/wasp/package.json

@@ -16,20 +16,14 @@
       {=!  Some of the statements in the comments might become incorrect. =}
       {=!  "our code" means: "web-app", "server" or "SDK", or "some combination of the three". =}
       {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./core/storage": "./dist/core/storage.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
       "./core/serialization": "./dist/core/serialization/index.js",
       "./core/auth": "./dist/core/auth.js",
       {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./auth/helpers/user": "./dist/auth/helpers/user.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
       "./auth/session": "./dist/auth/session.js",
       {=!  Used by our code, undocumented (but accessible) for users. =}
       "./auth/user": "./dist/auth/user.js",
       {=!  Used by our code, undocumented (but accessible) for users. =}
       "./auth/providers/types": "./dist/auth/providers/types.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./auth/types": "./dist/auth/types.js",
       {=!  Used by users, documented. =}
       "./auth/utils": "./dist/auth/utils.js",
       {=!  Used by our code, undocumented (but accessible) for users. =}
@@ -38,27 +32,7 @@
       "./auth/jwt": "./dist/auth/jwt.js",
       {=!  Used by user, documented. =}
       "./auth/validation": "./dist/auth/validation.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./auth/pages/createAuthRequiredPage": "./dist/auth/pages/createAuthRequiredPage.jsx",
-      {=!  Used by our framework code (Websockets), undocumented (but accessible) for users. =}
-      "./api/events": "./dist/api/events.js",
-      {=!  Used by users, documented. =}
-      "./operations": "./dist/operations/index.js",
-      {=!  If we import a symbol like "import something form 'wasp/something'", we must =}
-      {=!  expose it here (which leaks it to our users). We could avoid this by =}
-      {=!  using relative imports inside SDK code (instead of library imports), =}
-      {=!  but I didn't have time to implement it. =}
       "./src/*": "./dist/src/*.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./operations/*": "./dist/operations/*",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./universal/url": "./dist/universal/url.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./universal/types": "./dist/universal/types.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./universal/validators": "./dist/universal/validators.js",
-      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./universal/ansiColors": "./dist/universal/ansiColors.js",
       {=!  Parts are used by users, documented. Parts are probably used by our code, undocumented (but accessible). =}
       "./server/utils": "./dist/server/utils.js",
       {=!  Used by our code, undocumented (but accessible) for users. =}
@@ -75,14 +49,11 @@
       {=!  Todo(filip): This export becomes problematic once we start supporting different executors =}
       "./server/jobs/core/pgBoss": "./dist/server/jobs/core/pgBoss/index.js",
 
-      {=! Used by the framework client code, reconsider during refactoring. =}
-      "./client/webSocket/WebSocketProvider": "./dist/client/webSocket/WebSocketProvider.jsx",
       {=! Still needed, reconsider during refactoring. =}
       "./server/types": "./dist/server/types/index.js",
       {=! Used by the framework server code, reconsider during refactoring. =}
       "./server/middleware": "./dist/server/middleware/index.js",
 
-      {=! ================= NEW API HERE =================== =}
       {=! Public: { config, prisma, type ServerSetupFn, HttpError, type DbSeedFn, type MiddlewareConfigFn } =}
       {=! Private: [] =}
       "./server": "./dist/server/index.js",
@@ -112,26 +83,15 @@
       "./client/router": "./dist/client/router/index.js",
       "./client/test": "./dist/client/test/index.js",
       "./client/test/setup": "./dist/client/test/setup.js",
-      "./client/hooks": "./dist/client/hooks.js",
       "./client": "./dist/client/index.js",
       "./env": "./dist/env/index.js",
-      {=! Private: [client] =}
-      "./env/validation": "./dist/env/validation.js",
-      {=! Private: [client, sdk] =}
-      "./client/env/schema": "./dist/client/env/schema.js",
+      "./serialization": "./dist/serialization/index.js",
       {=! Private: [client] =}
       "./client/app": "./dist/client/app/index.jsx",
       "./client/app/layout": "./dist/client/app/layout.jsx",
       "./client/app/router": "./dist/client/app/router.jsx",
       {=! Private: [client] =}
-      "./client/vite": "./dist/client/vite/index.js",
-
-      {=! todo(filip): Fixes below are for type errors in 0.13.1, remove ASAP =}
-      {=! Used by our code (SDK for full-stack type safety), undocumented (but accessible) for users. =}
-      "./client/operations/rpc": "./dist/client/operations/rpc.js",
-      "./server/operations/actions":  "./dist/server/operations/actions/index.js",
-      "./server/operations/queries": "./dist/server/operations/queries/index.js",
-      "./server/_types": "./dist/server/_types/index.js"
+      "./client/vite": "./dist/client/vite/index.js"
 
    },
    {=!

package/data/Generator/templates/sdk/wasp/serialization/index.ts

@@ -0,0 +1,11 @@
+// PUBLIC API
+export type {
+  JSONArray,
+  JSONObject,
+  JSONValue,
+  Payload,
+  SerializableJSONValue,
+  SuperJSONArray,
+  SuperJSONObject,
+  SuperJSONValue,
+} from '../core/serialization/index.js'

package/data/Generator/templates/sdk/wasp/server/_types/index.ts

@@ -1,19 +1,19 @@
 {{={= =}=}}
-import { type Expand } from 'wasp/universal/types'
+import { type Expand } from '../../universal/types.js'
 import { type Request, type Response } from 'express'
 import {
   type ParamsDictionary as ExpressParams,
   type Query as ExpressQuery,
 } from 'express-serve-static-core'
-import { prisma } from 'wasp/server'
+import { prisma } from '../index.js'
 {=# isAuthEnabled =}
-import { type AuthUser } from 'wasp/auth'
+import { type AuthUser } from '../auth/user.js'
 {=/ isAuthEnabled =}
 import { type _Entity } from './taggedEntities'
-import { type Payload } from 'wasp/core/serialization'
+import { type Payload } from '../../core/serialization/index.js'
 
 export * from "./taggedEntities"
-export * from "wasp/core/serialization"
+export * from "../../core/serialization/index.js"
 
 export type UnauthenticatedQueryDefinition<
   Entities extends _Entity[],
@@ -101,5 +101,5 @@ type ContextWithUser<Entities extends _Entity[]> = Expand<
   Context<Entities> & { user?: AuthUser }
 >
 
-export type { ProviderName } from 'wasp/auth/utils'
+export type { ProviderName } from '../../auth/utils.js'
 {=/ isAuthEnabled =}

package/data/Generator/templates/sdk/wasp/server/_types/taggedEntities.ts

@@ -10,7 +10,7 @@ import {
   {=# entities =}
   type {= name =},
   {=/ entities =}
-} from 'wasp/entities'
+} from '../../entities/index.js'
 
 {=# entities =}
 export type {= internalTypeName =} = WithName<{= name =}, "{= name =}">

package/data/Generator/templates/sdk/wasp/server/auth/email/utils.ts

@@ -1,16 +1,16 @@
 {{={= =}=}}
-import { createJWT, TimeSpan } from 'wasp/auth/jwt'
-import { emailSender } from 'wasp/server/email';
-import { Email } from 'wasp/server/email/core/types';
+import { createJWT, TimeSpan } from '../../../auth/jwt.js'
+import { emailSender } from '../../email/index.js';
+import { Email } from '../../email/core/types.js';
 import {
   createProviderId,
   updateAuthIdentityProviderData,
   findAuthIdentity,
   getProviderDataWithPassword,
   type EmailProviderData,
-} from 'wasp/auth/utils';
-import { config as waspServerConfig } from 'wasp/server';
-import { type {= userEntityUpper =}, type {= authEntityUpper =} } from 'wasp/entities'
+} from '../../../auth/utils.js';
+import { config as waspServerConfig } from '../../index.js';
+import { type {= userEntityUpper =}, type {= authEntityUpper =} } from '../../../entities/index.js'
 
 // PUBLIC API
 export async function createEmailVerificationLink(

package/data/Generator/templates/sdk/wasp/server/crud/_operationTypes.ts

@@ -11,10 +11,10 @@ import type {
   _{= crud.entityUpper =},
 } from "../_types";
 import type { Prisma } from "@prisma/client";
-import type { Payload, SuperJSONObject } from "wasp/core/serialization";
+import type { Payload, SuperJSONObject } from "../../core/serialization/index.js";
 import type {
   {= crud.entityUpper =},
-} from "wasp/entities";
+} from "../../entities/index.js";
 {=# overrides.GetAll.isDefined =}
 {=& overrides.GetAll.importStatement =}
 {=/ overrides.GetAll.isDefined =}

package/data/Generator/templates/sdk/wasp/server/email/core/index.ts

@@ -11,6 +11,10 @@ export { initSendGridEmailSender as initEmailSender } from "./providers/sendgrid
 // PRIVATE API
 export { initMailgunEmailSender as initEmailSender } from "./providers/mailgun.js";
 {=/ isMailgunProviderEnabled =}
+{=# isResendProviderEnabled =}
+// PRIVATE API
+export { initResendEmailSender as initEmailSender } from "./providers/resend.js";
+{=/ isResendProviderEnabled =}
 {=# isDummyProviderEnabled =}
 // PRIVATE API
 export { initDummyEmailSender as initEmailSender } from "./providers/dummy.js";

package/data/Generator/templates/sdk/wasp/server/email/core/providers/dummy.ts

@@ -1,7 +1,7 @@
 import { getDefaultFromField } from "../helpers.js";
 import { DummyEmailProvider, EmailSender } from "../types";
 
-import { colorize } from "wasp/universal/ansiColors";
+import { colorize } from "../../../../universal/ansiColors.js";
 
 // PRIVATE API
 export function initDummyEmailSender(

package/data/Generator/templates/sdk/wasp/server/email/core/providers/resend.ts

@@ -0,0 +1,31 @@
+import { Resend } from 'resend';
+import { formatFromField, getDefaultFromField } from "../helpers.js";
+import type { ResendEmailProvider, EmailSender } from "../types";
+
+// PRIVATE API
+export function initResendEmailSender(
+  config: ResendEmailProvider
+): EmailSender {
+  const defaultFromField = getDefaultFromField();
+
+  const client = new Resend(config.apiKey);
+
+  return {
+    async send(email) {
+      // Resend's SDK resolves with `{ data, error }` instead of throwing on
+      // API errors, so we surface the error ourselves to match the other
+      // providers (and so callers' error handling actually fires).
+      const { data, error } = await client.emails.send({
+        from: formatFromField(email.from || defaultFromField),
+        to: email.to,
+        subject: email.subject,
+        text: email.text,
+        html: email.html,
+      });
+      if (error) {
+        throw error;
+      }
+      return data;
+    },
+  };
+}