Skip to content

Move server auth deps from SDK to server package.json #3479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
infomiho wants to merge 1 commit into from
+2 −10
Closed

Move server auth deps from SDK to server package.json #3479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions waspc/src/Wasp/Generator/SdkGenerator.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ import qualified Wasp.Generator.SdkGenerator.Server.OperationsGenerator as Serve
import Wasp.Generator.SdkGenerator.ServerApiG (genServerApi)
import Wasp.Generator.SdkGenerator.WebSocketGenerator (depsRequiredByWebSockets, genWebSockets)
import qualified Wasp.Generator.ServerGenerator.AuthG as AuthG
import qualified Wasp.Generator.ServerGenerator.AuthG as ServerAuthG
import qualified Wasp.Generator.ServerGenerator.Common as Server
import Wasp.Generator.ServerGenerator.DepVersions
( expressTypesVersion,
Expand Down Expand Up @@ -213,14 +212,6 @@ npmDepsForSdk spec =
]
++ depsRequiredForAuth spec
++ depsRequiredByOAuth spec
-- Server auth deps must be installed in the SDK because "@lucia-auth/adapter-prisma"
-- lists prisma/client as a dependency.
-- Installing it inside .wasp/out/server/node_modules would also
-- install prisma/client in the same folder, which would cause our
-- runtime to load the wrong (uninitialized prisma/client).
-- TODO(filip): Find a better way to handle duplicate
-- dependencies: https://github.com/wasp-lang/wasp/issues/1640
++ ServerAuthG.depsRequiredByAuth spec
++ depsRequiredByEmail spec
++ depsRequiredByWebSockets spec
++ depsRequiredForTesting
Expand Down
3 changes: 2 additions & 1 deletion waspc/src/Wasp/Generator/ServerGenerator.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import Wasp.Generator.NpmDependencies (NpmDepsForPackage (peerDependencies))
import qualified Wasp.Generator.NpmDependencies as N
import Wasp.Generator.NpmWorkspaces (serverPackageName)
import Wasp.Generator.ServerGenerator.ApiRoutesG (genApis)
import Wasp.Generator.ServerGenerator.AuthG (genAuth)
import Wasp.Generator.ServerGenerator.AuthG (depsRequiredByAuth, genAuth)
import qualified Wasp.Generator.ServerGenerator.Common as C
import Wasp.Generator.ServerGenerator.CrudG (genCrud)
import Wasp.Generator.ServerGenerator.Db.Seed (genDbSeed, getDbSeeds, getPackageJsonPrismaSeedField)
Expand Down Expand Up @@ -164,6 +164,7 @@ npmDepsFromWasp spec =
("helmet", "^6.0.0"),
("superjson", show superjsonVersion)
]
++ depsRequiredByAuth spec
++ depsRequiredByWebSockets spec,
N.devDependencies =
Npm.Dependency.fromList
Expand Down
Loading