diff --git a/waspc/.hlint.yaml b/waspc/.hlint.yaml index fb3b35f94..5c90dbac6 100644 --- a/waspc/.hlint.yaml +++ b/waspc/.hlint.yaml @@ -6,11 +6,8 @@ - -XQuasiQuotes - -XScopedTypeVariables -# TODO: Review the remaining ignored hlint rules. -- ignore: {name: Use camelCase} -- ignore: {name: Eta reduce} -- ignore: {name: Use first} -- ignore: {name: Use second} -- ignore: {name: Use newtype instead of data} -- ignore: {name: Use $>} -- ignore: {name: Use list comprehension} \ No newline at end of file +- ignore: {name: Use camelCase} # We can decide this on our own. +- ignore: {name: Eta reduce} # We can decide this on our own. +- ignore: {name: Use newtype instead of data} # We can decide this on our own. +- ignore: {name: Use $>} # I find it makes code harder to read if enforced. +- ignore: {name: Use list comprehension} # We can decide this on our own. diff --git a/waspc/src/Wasp/Generator/PackageJsonGenerator.hs b/waspc/src/Wasp/Generator/PackageJsonGenerator.hs index 704c6fe91..654ed5489 100644 --- a/waspc/src/Wasp/Generator/PackageJsonGenerator.hs +++ b/waspc/src/Wasp/Generator/PackageJsonGenerator.hs @@ -5,6 +5,7 @@ module Wasp.Generator.PackageJsonGenerator ) where +import Data.Bifunctor (second) import Data.List (find, intercalate) import Data.Maybe (fromJust, isJust) import qualified Wasp.NpmDependency as ND @@ -31,7 +32,7 @@ resolveNpmDeps waspDeps userDeps = where conflictingUserDeps :: [(ND.NpmDependency, NpmDependenciesConflictError)] conflictingUserDeps = - map (\(dep, err) -> (dep, fromJust err)) $ + map (second fromJust) $ filter (isJust . snd) $ map (\dep -> (dep, checkIfConflictingUserDep dep)) userDeps diff --git a/waspc/test/Generator/MockWriteableMonad.hs b/waspc/test/Generator/MockWriteableMonad.hs index ed32ad9c4..704d83a31 100644 --- a/waspc/test/Generator/MockWriteableMonad.hs +++ b/waspc/test/Generator/MockWriteableMonad.hs @@ -12,6 +12,7 @@ where import Control.Monad.State import qualified Data.Aeson as Aeson +import Data.Bifunctor (first) import Data.Text (Text, pack) import Fixtures (systemSPRoot) import StrongPath (Abs, Dir, File', Path', Rel, reldir, ()) @@ -71,7 +72,7 @@ instance MonadIO MockWriteableMonad where liftIO = undefined modifyLogs :: MonadState (a, b) m => (a -> a) -> m () -modifyLogs f = modify (\(logs, config) -> (f logs, config)) +modifyLogs f = modify (first f) newtype MockWriteableMonad a = MockWriteableMonad { unMockWriteableMonad :: State (MockWriteableMonadLogs, MockWriteableMonadConfig) a