Support lockfiles, take 2 (#1138)

Add lockfile support for all builds, no opt-out
purescript · Dec 20, 2023 · ebde68c · ebde68c
1 parent ffd9265
commit ebde68c
Show file tree

Hide file tree

Showing 68 changed files with 3,619 additions and 842 deletions.
diff --git a/bin/spago.yaml b/bin/spago.yaml
@@ -3,9 +3,11 @@ package:
   publish:
     version: 0.93.19
     license: BSD-3-Clause
+  build:
+    censor_project_warnings:
+      - WildcardInferredType
   dependencies:
     - aff
-    - optparse
     - arrays
     - codec-argonaut
     - console
@@ -14,6 +16,7 @@ package:
     - node-fs
     - node-path
     - node-process
+    - optparse
     - ordered-collections
     - record
     - refs

diff --git a/bin/src/Flags.purs b/bin/src/Flags.purs
@@ -164,6 +164,13 @@ transitive =
         <> O.help "Include transitive dependencies"
     )
 
+pure :: Parser Boolean
+pure =
+  O.switch
+    ( O.long "pure"
+        <> O.help "Use the package information from the current lockfile, even if it is out of date"
+    )
+
 pedanticPackages :: Parser Boolean
 pedanticPackages =
   O.switch

diff --git a/bin/src/Main.purs b/bin/src/Main.purs
diff --git a/core/src/Config.purs b/core/src/Config.purs
@@ -288,12 +288,10 @@ type WorkspaceConfig =
   , extra_packages :: Maybe (Map PackageName ExtraPackage)
   , backend :: Maybe BackendConfig
   , build_opts :: Maybe WorkspaceBuildOptionsInput
-  , lock :: Maybe Boolean
   }
 
 workspaceConfigCodec :: JsonCodec WorkspaceConfig
 workspaceConfigCodec = CA.object "WorkspaceConfig"
-  $ CA.recordPropOptional (Proxy :: _ "lock") CA.boolean
   $ CA.recordPropOptional (Proxy :: _ "package_set") setAddressCodec
   $ CA.recordPropOptional (Proxy :: _ "backend") backendConfigCodec
   $ CA.recordPropOptional (Proxy :: _ "build_opts") buildOptionsCodec

diff --git a/core/src/Prelude.purs b/core/src/Prelude.purs
@@ -10,8 +10,8 @@ import Prelude
 
 import Control.Alt ((<|>)) as Extra
 import Control.Monad.Error.Class (class MonadError, class MonadThrow, try, catchError) as Extra
-import Control.Monad.Reader (ask, asks) as Extra
-import Control.Monad.Reader (class MonadAsk, ReaderT, runReaderT)
+import Control.Monad.Reader (ask, asks, local) as Extra
+import Control.Monad.Reader (class MonadAsk, class MonadReader, ReaderT, runReaderT)
 import Control.Monad.State (StateT) as Extra
 import Data.Array ((..)) as Extra
 import Data.Array.NonEmpty (NonEmptyArray) as Extra
@@ -65,6 +65,7 @@ derive newtype instance Extra.MonadAff (Spago env)
 derive newtype instance Extra.MonadThrow Extra.Error (Spago env)
 derive newtype instance Extra.MonadError Extra.Error (Spago env)
 derive newtype instance MonadAsk env (Spago env)
+derive newtype instance MonadReader env (Spago env)
 
 runSpago' :: forall a env. env -> Spago env a -> Extra.Aff a
 runSpago' env (Spago m) = runReaderT m env

diff --git a/flake.lock b/flake.lock