Apply the SDK location hack to the libs

Author: infomiho

waspc/src/Wasp/Generator/WaspLibs.hs

@@ -8,11 +8,10 @@ import Control.Exception (catch)
 import StrongPath
   ( Abs,
     Dir,
-    Dir',
     Path',
     Rel,
-    Rel',
     basename,
+    castRel,
     fromAbsDir,
     reldir,
     (</>),
@@ -23,26 +22,37 @@ import qualified Wasp.Data as Data
 import qualified Wasp.ExternalConfig.Npm.Dependency as Npm.Dependency
 import Wasp.Generator.Common (ProjectRootDir)
 import Wasp.Generator.Monad (GeneratorError (GenericGeneratorError))
+import Wasp.Project.Common (generatedCodeDirInDotWaspDir)
 import Wasp.Util.IO (copyDirectoryIf, listDirectory)
 
-data LibsDir
+data LibsSourceDir
+
+data LibsRootDir
 
 setUpLibs :: Path' Abs (Dir ProjectRootDir) -> IO [GeneratorError]
-setUpLibs dstDir = do
+setUpLibs projectRootDir = do
   (setUpLibsIO >> return [])
     `catch` (\e -> return [GenericGeneratorError $ show (e :: IOError)])
   where
     setUpLibsIO :: IO ()
     setUpLibsIO = do
       srcPath <- (</> libsDirPathInDataDir) <$> Data.getAbsDataDirPath
-      let dstPath = dstDir </> [reldir|libs|]
+      let dstPath = projectRootDir </> libsRootDirInProjectRootDir
       copyDirectoryIf
         srcPath
         dstPath
         (\dirName -> basename dirName /= [reldir|node_modules|])
       ensureLibsReady dstPath
 
-libsDirPathInDataDir :: Path' (Rel Data.DataDir) (Dir LibsDir)
+-- TODO: dedupe this with the same logic in SDK
+-- The libs need to follow the SDK location in the generated code directory.
+libsRootDirInProjectRootDir :: Path' (Rel ProjectRootDir) (Dir LibsRootDir)
+libsRootDirInProjectRootDir =
+  [reldir|../|]
+    </> basename generatedCodeDirInDotWaspDir
+    </> [reldir|libs|]
+
+libsDirPathInDataDir :: Path' (Rel Data.DataDir) (Dir LibsSourceDir)
 libsDirPathInDataDir = [reldir|Generator/libs|]
 
 waspLibsDeps :: [Npm.Dependency.Dependency]
@@ -51,18 +61,18 @@ waspLibsDeps =
     [ ("@wasp.sh/libs-auth", "file:../../libs/auth")
     ]
 
-ensureLibsReady :: Path' Abs Dir' -> IO ()
+ensureLibsReady :: Path' Abs (Dir d) -> IO ()
 ensureLibsReady libsDir = do
   (_, dirs) <- listDirectory libsDir
   mapM_ ensureLibReady dirs
   where
-    ensureLibReady :: Path' Rel' Dir' -> IO ()
+    ensureLibReady :: Path' (Rel r) (Dir d) -> IO ()
     ensureLibReady libDirRelPath = do
-      let libDir = libsDir </> libDirRelPath
+      let libDir = libsDir </> castRel libDirRelPath
       installDeps libDir
       buildLib libDir
 
-installDeps :: Path' Abs Dir' -> IO ()
+installDeps :: Path' Abs (Dir d) -> IO ()
 installDeps libDir = do
   let npmInstallCreateProcess = npmInstallProcess {P.cwd = Just $ fromAbsDir libDir}
   (exitCode, _out, _err) <- P.readCreateProcessWithExitCode npmInstallCreateProcess ""
@@ -72,7 +82,7 @@ installDeps libDir = do
   where
     npmInstallProcess = P.proc "npm" ["install"]
 
-buildLib :: Path' Abs Dir' -> IO ()
+buildLib :: Path' Abs (Dir d) -> IO ()
 buildLib libDir = do
   let npmInstallCreateProcess = npmBuildProcess {P.cwd = Just $ fromAbsDir libDir}
   (exitCode, _out, _err) <- P.readCreateProcessWithExitCode npmInstallCreateProcess ""