From 818b52cd507c91154886e013081f6afefea0325f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Sodi=C4=87?= Date: Wed, 22 Jan 2025 11:54:39 +0100 Subject: [PATCH] Small cleanup --- waspc/src/Wasp/Project/Common.hs | 14 +++++++------- waspc/src/Wasp/Util/IO.hs | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/waspc/src/Wasp/Project/Common.hs b/waspc/src/Wasp/Project/Common.hs index ecf95e89b3..fbda32047c 100644 --- a/waspc/src/Wasp/Project/Common.hs +++ b/waspc/src/Wasp/Project/Common.hs @@ -33,7 +33,7 @@ where import StrongPath (Abs, Dir, File, File', Path', Rel, reldir, relfile, toFilePath, ()) import System.Directory (doesFileExist) import Wasp.AppSpec.ExternalFiles (SourceExternalCodeDir, SourceExternalPublicDir) -import qualified Wasp.Generator.Common as Generator +import qualified Wasp.Generator.Common as Generator.Common type CompileError = String @@ -66,29 +66,29 @@ nodeModulesDirInWaspProjectDir :: Path' (Rel WaspProjectDir) (Dir NodeModulesDir nodeModulesDirInWaspProjectDir = [reldir|node_modules|] -- | NOTE: If you change the depth of this path, also update @waspProjectDirFromProjectRootDir@ below. --- TODO: Hm this has different name than it has in Generator. -generatedCodeDirInDotWaspDir :: Path' (Rel DotWaspDir) (Dir Generator.ProjectRootDir) +-- TODO: Hm this has different name than it has in Generator.Common. +generatedCodeDirInDotWaspDir :: Path' (Rel DotWaspDir) (Dir Generator.Common.ProjectRootDir) generatedCodeDirInDotWaspDir = [reldir|out|] -- | NOTE: If you change the depth of this path, also update @waspProjectDirFromProjectRootDir@ below. -buildDirInDotWaspDir :: Path' (Rel DotWaspDir) (Dir Generator.ProjectRootDir) +buildDirInDotWaspDir :: Path' (Rel DotWaspDir) (Dir Generator.Common.ProjectRootDir) buildDirInDotWaspDir = [reldir|build|] -- Todo: find a better way to define this -waspProjectDirFromAppComponentDir :: Generator.AppComponentRootDir d => Path' (Rel d) (Dir WaspProjectDir) +waspProjectDirFromAppComponentDir :: Generator.Common.AppComponentRootDir d => Path' (Rel d) (Dir WaspProjectDir) waspProjectDirFromAppComponentDir = [reldir|../../../|] -- | NOTE: This path is calculated from the values of @dotWaspDirInWaspProjectDir@, -- @generatedCodeDirInDotWaspDir@ and @buildDirInDotWaspDir@., which are the three functions just above. -- Also, it assumes @generatedCodeDirInDotWaspDir@ and @buildDirInDotWaspDir@ have same depth. -- If any of those change significantly (their depth), this path should be adjusted. -waspProjectDirFromProjectRootDir :: Path' (Rel Generator.ProjectRootDir) (Dir WaspProjectDir) +waspProjectDirFromProjectRootDir :: Path' (Rel Generator.Common.ProjectRootDir) (Dir WaspProjectDir) waspProjectDirFromProjectRootDir = [reldir|../../|] dotWaspRootFileInWaspProjectDir :: Path' (Rel WaspProjectDir) File' dotWaspRootFileInWaspProjectDir = [relfile|.wasproot|] -dotWaspInfoFileInGeneratedCodeDir :: Path' (Rel Generator.ProjectRootDir) File' +dotWaspInfoFileInGeneratedCodeDir :: Path' (Rel Generator.Common.ProjectRootDir) File' dotWaspInfoFileInGeneratedCodeDir = [relfile|.waspinfo|] packageJsonInWaspProjectDir :: Path' (Rel WaspProjectDir) (File PackageJsonFile) diff --git a/waspc/src/Wasp/Util/IO.hs b/waspc/src/Wasp/Util/IO.hs index 0f86df3ed0..d18eb4513d 100644 --- a/waspc/src/Wasp/Util/IO.hs +++ b/waspc/src/Wasp/Util/IO.hs @@ -29,7 +29,7 @@ import Data.Text (Text) import qualified Data.Text.IO as T.IO import qualified Data.Text.IO as Text.IO import qualified Path.IO as PathIO -import StrongPath (Abs, Dir, Dir', File, Path', Rel, basename, parseRelDir, parseRelFile, toFilePath, ()) +import StrongPath (Abs, Dir, File, Path', Rel, basename, parseRelDir, parseRelFile, toFilePath, ()) import qualified StrongPath as SP import qualified StrongPath.Path as SP.Path import qualified System.Directory as SD