Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix flags for fable -- fixes #475 #476

Merged
merged 2 commits into from
Aug 31, 2021
Merged

Fix flags for fable -- fixes #475 #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8739d2c
Fix flags for fable -- fixes #475
theimowski Aug 31, 2021
e48f7b6
Add test for bundle target
theimowski Aug 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Content/default/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.fable/
*.fs.js
*.fs.js.map
.fake/
.farmer/
.idea/
Expand Down
2 changes: 1 addition & 1 deletion Content/default/Build.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Target.create "InstallClient" (fun _ -> run npm "install" ".")

Target.create "Bundle" (fun _ ->
[ "server", dotnet $"publish -c Release -o \"{deployPath}\"" serverPath
"client", dotnet "fable --run -s webpack -p" clientPath ]
"client", dotnet "fable -o output -s --run webpack -p" clientPath ]
|> runParallel
)

Expand Down
7 changes: 6 additions & 1 deletion tests/Tests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,13 @@ let testTemplateBuild templateType =
Expect.stringContains response htmlSearchPhrase
(sprintf "html fragment not found for %A" templateType)
logger.info(
eventX "Template type `{type}` run successfully"
eventX "Run target for `{type}` run successfully"
>> setField "type" templateType)
if templateType = Normal then
run dotnet "run -- bundle" dir
logger.info(
eventX "Bundle target for `{type}` run successfully"
>> setField "type" templateType)
finally
killProcessTree proc.Id
extraProc |> Option.map (fun p -> p.Id) |> Option.iter killProcessTree
Expand Down