Pagwin/psb
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

esbuild stdout and stderr are yeeted for now, may make use of exit code as circumstance to emit them again in future

Browse source
This commit is contained in:
Pagwin 2026-02-23 21:20:04 -05:00
parent b3808f4136
commit 009806c2b0
No known key found for this signature in database
GPG key ID: 81137023740CA260
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Utilities/Bundling.hs
View file

@ -21,7 +21,7 @@ import Data.Maybe (fromJust)
import Data.String (IsString (fromString)) import Data.String (IsString (fromString))
import Data.Text (Text) import Data.Text (Text)
import qualified Data.Text as T import qualified Data.Text as T
import Development.Shake (Action, RuleResult, Rules, addOracle, addOracleCache, cmd_, command_, getDirectoryFiles, need, newCache, readFile', (%>)) import Development.Shake (Action, RuleResult, Rules, Stderr (Stderr), Stdout (Stdout), addOracle, addOracleCache, cmd, command_, getDirectoryFiles, need, newCache, readFile', (%>))
import Development.Shake.Classes import Development.Shake.Classes
import Development.Shake.FilePath ((</>)) import Development.Shake.FilePath ((</>))
import GHC.Generics (Generic) import GHC.Generics (Generic)
@ -39,16 +39,8 @@ type instance RuleResult BuildOracleVariant = BuildOutputs
resource_dir :: FilePath resource_dir :: FilePath
resource_dir = outputDir </> "resources" resource_dir = outputDir </> "resources"
-- TODO: not sure if I want all bundling to be an all at once afair, per file format
-- or multiple stages for various formats
--
-- Regardless the objective is to produce all of that while outputting a file to
-- indicate completion/fulfill a need directive without rebuilding even when files
-- are left unchanged, maybe have the need be a $(filename).hash which we compute
-- ourselves based on the unminified input
bundled :: Rules () bundled :: Rules ()
bundled = do bundled = do
-- TODO: Need to adjust this oracle to split out source maps from js and css files
oracle <- addOracleCache $ \q -> case q of oracle <- addOracleCache $ \q -> case q of
CSS -> bundle_css CSS -> bundle_css
Javascript -> bundle_scripts Javascript -> bundle_scripts
@ -69,6 +61,8 @@ css_esbuild_options =
"--metafile=" ++ css_meta_file "--metafile=" ++ css_meta_file
] ]
-- I'm aware that this json handling is simultaneously overkill and a hack job
-- however I don't care, I generated this mostly with an LLM anyways
newtype Metafile = Metafile newtype Metafile = Metafile
{ outputs :: Object -- keys are the file paths { outputs :: Object -- keys are the file paths
} }
@ -93,7 +87,7 @@ bundle_css :: Action BuildOutputs
bundle_css = do bundle_css = do
need cssGlobs need cssGlobs
css_files <- getDirectoryFiles "" cssGlobs css_files <- getDirectoryFiles "" cssGlobs
cmd_ ("esbuild" :: String) (generic_esbuild_options ++ css_esbuild_options ++ css_files) (Stderr (), Stdout ()) <- cmd ("esbuild" :: String) (generic_esbuild_options ++ css_esbuild_options ++ css_files)
metafile_outputs css_meta_file metafile_outputs css_meta_file
-- Javascript and typescript -- Javascript and typescript
@ -113,5 +107,5 @@ bundle_scripts :: Action BuildOutputs
bundle_scripts = do bundle_scripts = do
need jsGlobs need jsGlobs
js_files <- getDirectoryFiles "" jsGlobs js_files <- getDirectoryFiles "" jsGlobs
cmd_ ("esbuild" :: String) (generic_esbuild_options ++ js_esbuild_options ++ js_files) (Stderr (), Stdout ()) <- cmd ("esbuild" :: String) (generic_esbuild_options ++ js_esbuild_options ++ js_files)
metafile_outputs js_meta_file metafile_outputs js_meta_file