Fix the output flag to not provide a default value (#1052)

purescript · Oct 11, 2023 · 439ac9c · 439ac9c
1 parent 1875379
commit 439ac9c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 22 deletions.
diff --git a/bin/spago.yaml b/bin/spago.yaml
@@ -1,7 +1,7 @@
 package:
   name: spago-bin
   publish:
-    version: 0.93.15
+    version: 0.93.17
     license: BSD-3-Clause
   dependencies:
     - aff

diff --git a/bin/src/Flags.purs b/bin/src/Flags.purs
@@ -4,19 +4,17 @@ import Spago.Prelude
 
 import Data.Array as Array
 import Data.List as List
-import Data.Set.NonEmpty (NonEmptySet)
-import Data.Set.NonEmpty as NonEmptySet
 import Options.Applicative (FlagFields, Mod, Parser)
 import Options.Applicative as O
-import Options.Applicative.Types as O
+import Options.Applicative.Types as OT
 import Spago.Core.Config as Core
 
 flagMaybe ∷ ∀ (a ∷ Type). a -> Mod FlagFields (Maybe a) -> Parser (Maybe a)
 flagMaybe a mod = O.flag Nothing (Just a) mod
 
 selectedPackage :: Parser (Maybe String)
 selectedPackage =
-  O.optional $
+  OT.optional $
     O.strOption
       ( O.long "package"
           <> O.short 'p'
@@ -52,23 +50,23 @@ minify =
 
 entrypoint :: Parser (Maybe String)
 entrypoint =
-  O.optional
+  OT.optional
     $ O.strOption
         ( O.long "module"
             <> O.help "The module to bundle as the entrypoint"
         )
 
 bundleType :: Parser (Maybe String)
 bundleType =
-  O.optional
+  OT.optional
     $ O.strOption
         ( O.long "bundle-type"
             <> O.help "The type of the module produced. 'app' will call main, 'module' will just export the contents."
         )
 
 outfile :: Parser (Maybe String)
 outfile =
-  O.optional
+  OT.optional
     $ O.strOption
         ( O.long "outfile"
             <> O.help "Destination path for the bundle"
@@ -77,7 +75,7 @@ outfile =
 -- TODO make an ADT for node and browser
 platform :: Parser (Maybe String)
 platform =
-  O.optional
+  OT.optional
     $ O.option
         ( O.eitherReader
             case _ of
@@ -91,12 +89,11 @@ platform =
 
 output :: Parser (Maybe String)
 output =
-  O.optional
+  OT.optional
     $ O.strOption
         ( O.long "output"
             <> O.help "The output directory for compiled files"
             <> O.metavar "DIR"
-            <> O.value "output"
         )
 
 quiet :: Parser Boolean
@@ -174,7 +171,7 @@ pursArgs =
 
 execArgs :: Parser (Maybe (Array String))
 execArgs =
-  O.optional
+  OT.optional
     $ Array.fromFoldable
     <$> O.many
       ( O.strArgument
@@ -194,7 +191,7 @@ backendArgs =
 
 moduleName :: Parser (Maybe String)
 moduleName =
-  O.optional
+  OT.optional
     $ O.strOption
         ( O.long "main"
             <> O.short 'm'
@@ -232,23 +229,23 @@ package =
 
 maybeVersion :: Parser (Maybe String)
 maybeVersion =
-  O.optional $
+  OT.optional $
     O.strArgument
       ( O.metavar "VERSION"
           <> O.help "Package version"
       )
 
 maybeSetVersion :: Parser (Maybe String)
 maybeSetVersion =
-  O.optional $
+  OT.optional $
     O.strOption
       ( O.long "package-set"
           <> O.help "Optional package set version to be used instead of the latest one"
       )
 
 maybePackageName :: Parser (Maybe String)
 maybePackageName =
-  O.optional $
+  OT.optional $
     O.strOption
       ( O.long "name"
           <> O.help "Optional package name to be used for the new project"

diff --git a/bin/src/Main.purs b/bin/src/Main.purs
@@ -11,7 +11,6 @@ import Data.JSDate as JSDate
 import Data.List as List
 import Data.Map as Map
 import Data.Maybe as Maybe
-import Data.Set.NonEmpty (NonEmptySet)
 import Data.String as String
 import Effect.Aff as Aff
 import Effect.Ref as Ref

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spago",
-  "version": "0.93.15",
+  "version": "0.93.17",
   "license": "BSD-3-Clause",
   "description": "🍝 PureScript package manager and build tool",
   "keywords": [
@@ -29,7 +29,7 @@
     "format": "purs-tidy format-in-place core src bin docs-search",
     "format:check": "purs-tidy check core src bin docs-search",
     "bundle": "spago bundle -p spago-bin",
-    "prepublishOnly": "./bin/index.dev.js bundle -p spago-bin"
+    "prepublishOnly": "spago build && ./bin/index.dev.js bundle -p spago-bin"
   },
   "dependencies": {
     "better-sqlite3": "^8.6.0",

diff --git a/spago.yaml b/spago.yaml
@@ -1,7 +1,7 @@
 package:
   name: spago
   publish:
-    version: 0.93.15
+    version: 0.93.17
     license: BSD-3-Clause
     location:
       githubOwner: purescript