Moving logic from templates to libs

waspc/data/Generator/templates/react-app/vite.config.ts

@@ -25,7 +25,7 @@ const defaultViteConfig = {
     detectServerImports(),
   ],
   optimizeDeps: {
-    exclude: ['wasp']
+    exclude:  {=& depsExcludedFromOptimization =}
   },
   server: {
     port: {= defaultClientPort =},

waspc/data/Generator/templates/sdk/wasp/auth/forms/Auth.tsx

@@ -2,11 +2,11 @@
 import { useState, createContext } from 'react'
 import { createTheme } from '@stitches/react'
 import { styled } from 'wasp/core/stitches.config'
+import { AuthContext, type ErrorMessage } from '@wasp.sh/libs-auth/client'
 
 import {
   type State,
   type CustomizationOptions,
-  type ErrorMessage,
   type AdditionalSignupFields,
 } from './types'
 import { LoginSignupForm } from './internal/common/LoginSignupForm'
@@ -38,14 +38,6 @@ const HeaderText = styled('h2', {
 })
 
 
-// PRIVATE API
-export const AuthContext = createContext({
-  isLoading: false,
-  setIsLoading: (isLoading: boolean) => {},
-  setErrorMessage: (errorMessage: ErrorMessage | null) => {},
-  setSuccessMessage: (successMessage: string | null) => {},
-})
-
 function Auth ({ state, appearance, logo, socialLayout = 'horizontal', additionalSignupFields }: {
     state: State;
 } & CustomizationOptions & {

waspc/data/Generator/templates/sdk/wasp/auth/forms/internal/common/LoginSignupForm.tsx

@@ -1,10 +1,9 @@
 {{={= =}=}}
-import { useContext } from 'react'
 import { useForm, UseFormReturn } from 'react-hook-form'
 import { styled } from 'wasp/core/stitches.config'
 import { config } from 'wasp/client'
 
-import { AuthContext } from '../../Auth'
+import { useAuthContext } from '@wasp.sh/libs-auth/client'
 import {
   Form,
   FormInput,
@@ -146,7 +145,7 @@ export const LoginSignupForm = ({
     setErrorMessage,
     setSuccessMessage,
     setIsLoading,
-  } = useContext(AuthContext)
+  } = useAuthContext();
   const isLogin = state === 'login'
   const cta = isLogin ? 'Log in' : 'Sign up';
   {=# isAnyPasswordBasedAuthEnabled =}

waspc/data/Generator/templates/sdk/wasp/auth/forms/internal/email/ForgotPasswordForm.tsx

@@ -1,13 +1,14 @@
-import { useContext } from 'react'
 import { useForm } from 'react-hook-form'
+import { useAuthContext } from '@wasp.sh/libs-auth/client'
+
 import { requestPasswordReset } from '../../../email/actions/passwordReset.js'
 import { Form, FormItemGroup, FormLabel, FormInput, SubmitButton, FormError } from '../Form'
-import { AuthContext } from '../../Auth'
+
 
 // PRIVATE API
 export const ForgotPasswordForm = () => {
   const { register, handleSubmit, reset, formState: { errors } } = useForm<{ email: string }>()
-  const { isLoading, setErrorMessage, setSuccessMessage, setIsLoading } = useContext(AuthContext)
+  const { isLoading, setErrorMessage, setSuccessMessage, setIsLoading } = useAuthContext()
 
   const onSubmit = async (data) => {
     setIsLoading(true)

waspc/data/Generator/templates/sdk/wasp/auth/forms/internal/email/ResetPasswordForm.tsx

@@ -1,14 +1,14 @@
-import { useContext } from 'react'
 import { useForm } from 'react-hook-form'
-import { resetPassword } from '../../../email/actions/passwordReset.js'
 import { useLocation } from 'react-router-dom'
+import { useAuthContext } from '@wasp.sh/libs-auth/client'
+
+import { resetPassword } from '../../../email/actions/passwordReset.js'
 import { Form, FormItemGroup, FormLabel, FormInput, SubmitButton, FormError } from '../Form'
-import { AuthContext } from '../../Auth'
 
 // PRIVATE API
 export const ResetPasswordForm = () => {
   const { register, handleSubmit, reset, formState: { errors } } = useForm<{ password: string; passwordConfirmation: string }>()
-  const { isLoading, setErrorMessage, setSuccessMessage, setIsLoading } = useContext(AuthContext)
+  const { isLoading, setErrorMessage, setSuccessMessage, setIsLoading } = useAuthContext()
   const location = useLocation()
   const token = new URLSearchParams(location.search).get('token')
   const onSubmit = async (data) => {

waspc/data/Generator/templates/sdk/wasp/auth/forms/internal/email/VerifyEmailForm.tsx

@@ -1,12 +1,12 @@
-import { useContext, useEffect } from 'react'
+import { useEffect } from 'react'
 import { useLocation } from 'react-router-dom'
+import { useAuthContext } from '@wasp.sh/libs-auth/client'
 import { verifyEmail } from '../../../email/actions/verifyEmail.js'
 import { Message } from '../Message'
-import { AuthContext } from '../../Auth'
 
 // PRIVATE API
 export const VerifyEmailForm = () => {
-  const { isLoading, setErrorMessage, setSuccessMessage, setIsLoading } = useContext(AuthContext)
+  const { isLoading, setErrorMessage, setSuccessMessage, setIsLoading } = useAuthContext()
   const location = useLocation()
   const token = new URLSearchParams(location.search).get('token')
 

waspc/data/Generator/templates/sdk/wasp/auth/forms/types.ts

@@ -21,12 +21,6 @@ export type CustomizationOptions = {
   appearance?: Parameters<typeof createTheme>[0]
 }
 
-// PRIVATE API
-export type ErrorMessage = {
-  title: string
-  description?: string
-}
-
 // PRIVATE API
 export type FormState = {
   isLoading: boolean

waspc/data/Generator/templates/sdk/wasp/auth/jwt.ts

@@ -1,15 +1,15 @@
-import { createCreateJWT, createValidateJWT } from "@wasp.sh/libs-auth";
+import { createJWTHelpers } from "@wasp.sh/libs-auth";
 
 import { config } from "wasp/server";
 
 const JWT_SECRET = new TextEncoder().encode(config.auth.jwtSecret);
 const JWT_ALGORITHM = "HS256";
 
 // PRIVATE API
-export const createJWT = createCreateJWT(JWT_SECRET, JWT_ALGORITHM);
-
-// PRIVATE API
-export const validateJWT = createValidateJWT(JWT_SECRET, JWT_ALGORITHM);
+export const { createJWT, validateJWT } = createJWTHelpers(
+  JWT_SECRET,
+  JWT_ALGORITHM,
+);
 
 // PRIVATE API
 export { TimeSpan } from "@wasp.sh/libs-auth";

waspc/data/Generator/templates/sdk/wasp/client/index.ts

@@ -15,7 +15,3 @@ export { config, ClientConfig } from './config.js'
 
 // PUBLIC API
 export { env } from './env.js'
-
-import { cowsay } from "@wasp.sh/libs-auth/client"
-
-console.log(cowsay("Hello from Wasp SDK!"))

waspc/libs/README.md

@@ -1,13 +1,18 @@
 # Testing Libs Locally
 
 Run `tools/install_libs_to_data_dir.sh` to compile the libs and copy
-them into `data/`. Then you can use `cabal run` as normal, or you can
-`cabal install` and then use `wasp-cli`.
+them into `data/`. Then you can use `./run wasp-cli` as normal. You can run
+`./run install` which will run the script before installing the
+Wasp CLI.
 
 # Adding a New Package
 
-Create a directory in this folder to contain the new package. It should have a
-`pack-and-copy` script inside `package.json`.
+Create a directory in this folder to contain the new package. It should contain a
+`prepare` script that will be run to prepare the package for use e.g. to build
+the package.
+
+The package will be packaged using `npm pack` and the resulting tarball will
+be copied to `data/libs/` by the `tools/install_libs_to_data_dir.sh` script.
 
 # CI Builds/Release
 

waspc/libs/auth/README.md

@@ -1,3 +1,3 @@
 # Wasp Auth Library
 
-Based on a `unbuild` template.
+Based on the default `tsdown` template.