Skip to content

Generate paket.lock for all possible template options #139

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

Merged
theimowski merged 26 commits into from
Aug 10, 2018
Merged

Generate paket.lock for all possible template options #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8735b7f
Move '--port free' argument - refers to #114
theimowski Aug 10, 2018
669b003
Generate default paket lock for each group
theimowski Aug 1, 2018
53619d8
BuildPaketLockFiles
theimowski Aug 1, 2018
40470b3
Update Build group for default paket.lock
theimowski Aug 1, 2018
c487207
Come up with convention for naming lock files
theimowski Aug 1, 2018
7e9c08f
Generate based on partial names
theimowski Aug 3, 2018
d8234b8
Generate for default and deploy azure
theimowski Aug 3, 2018
1b0e2ab
Simplify paket.lock include conditions in template.json
theimowski Aug 3, 2018
deb9c22
Order json properties
theimowski Aug 3, 2018
1a7e048
Remove illegal combinations
theimowski Aug 3, 2018
19e628b
Replace paket-azure and paket-default lock files with fully named files
theimowski Aug 3, 2018
19ec0f4
GenJsonConditions
theimowski Aug 3, 2018
07de781
fix condition for '--layout none'
theimowski Aug 3, 2018
6bd56d0
Generate paket_noremoting-nofulma.lock
theimowski Aug 3, 2018
3141fb3
Add lock file for --layout none
theimowski Aug 3, 2018
e5ab3a7
Do not duplicate groups
theimowski Aug 6, 2018
a8d592f
MOAR lock files
theimowski Aug 6, 2018
9f5f46e
lock files for giraffe
theimowski Aug 6, 2018
264079e
Add suave lock files, remove combined
theimowski Aug 6, 2018
2672719
enable Azure in tests
theimowski Aug 6, 2018
edad672
Update Build group dependencies
theimowski Aug 8, 2018
3582fa3
Update Client groups
theimowski Aug 8, 2018
c5e757d
Update server group
theimowski Aug 8, 2018
b9249b0
Add test for paket.lock existence
theimowski Aug 8, 2018
2560024
Fix azure condition
theimowski Aug 8, 2018
cd51107
Fix compiler warnings in tests
theimowski Aug 10, 2018
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ nupkg/
obj/
Content/paket.lock
bin/
gen-paket-lock-files/
132 changes: 118 additions & 14 deletions Content/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,33 +115,137 @@
},
"sources": [
{
"exclude": "**/.template.config/**/*",
"exclude": [ "**/.template.config/**/*", "**/paket*.lock" ],
"modifiers": [
{
"exclude": "**/ServerSuave.fs",
"condition": "(server != \"suave\")"
"include": "paket_noazure_noremoting-nofulma_saturn-noremoting-noazure.lock",
"condition": "(server == \"saturn\" && remoting == false && deploy != \"azure\" && layout == \"none\")",
"rename": { "paket_noazure_noremoting-nofulma_saturn-noremoting-noazure.lock": "paket.lock" }
},
{
"rename": {
"ServerSuave.fs": "Server.fs"
}
"include": "paket_noazure_noremoting-nofulma_giraffe-noremoting-noazure.lock",
"condition": "(server == \"giraffe\" && remoting == false && deploy != \"azure\" && layout == \"none\")",
"rename": { "paket_noazure_noremoting-nofulma_giraffe-noremoting-noazure.lock": "paket.lock" }
},
{
"exclude": "**/paket-default.lock",
"condition": "(server != \"saturn\" || remoting != false || deploy != \"none\")"
"include": "paket_noazure_noremoting-nofulma_suave-noremoting-noazure.lock",
"condition": "(server == \"suave\" && remoting == false && deploy != \"azure\" && layout == \"none\")",
"rename": { "paket_noazure_noremoting-nofulma_suave-noremoting-noazure.lock": "paket.lock" }
},
{
"rename": {
"paket-default.lock": "paket.lock"
}
"include": "paket_noazure_remoting-nofulma_saturn-remoting-noazure.lock",
"condition": "(server == \"saturn\" && remoting == true && deploy != \"azure\" && layout == \"none\")",
"rename": { "paket_noazure_remoting-nofulma_saturn-remoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_remoting-nofulma_giraffe-remoting-noazure.lock",
"condition": "(server == \"giraffe\" && remoting == true && deploy != \"azure\" && layout == \"none\")",
"rename": { "paket_noazure_remoting-nofulma_giraffe-remoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_remoting-nofulma_suave-remoting-noazure.lock",
"condition": "(server == \"suave\" && remoting == true && deploy != \"azure\" && layout == \"none\")",
"rename": { "paket_noazure_remoting-nofulma_suave-remoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_noremoting-fulma_saturn-noremoting-noazure.lock",
"condition": "(server == \"saturn\" && remoting == false && deploy != \"azure\" && layout != \"none\")",
"rename": { "paket_noazure_noremoting-fulma_saturn-noremoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_noremoting-fulma_giraffe-noremoting-noazure.lock",
"condition": "(server == \"giraffe\" && remoting == false && deploy != \"azure\" && layout != \"none\")",
"rename": { "paket_noazure_noremoting-fulma_giraffe-noremoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_noremoting-fulma_suave-noremoting-noazure.lock",
"condition": "(server == \"suave\" && remoting == false && deploy != \"azure\" && layout != \"none\")",
"rename": { "paket_noazure_noremoting-fulma_suave-noremoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_remoting-fulma_saturn-remoting-noazure.lock",
"condition": "(server == \"saturn\" && remoting == true && deploy != \"azure\" && layout != \"none\")",
"rename": { "paket_noazure_remoting-fulma_saturn-remoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_remoting-fulma_giraffe-remoting-noazure.lock",
"condition": "(server == \"giraffe\" && remoting == true && deploy != \"azure\" && layout != \"none\")",
"rename": { "paket_noazure_remoting-fulma_giraffe-remoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_noazure_remoting-fulma_suave-remoting-noazure.lock",
"condition": "(server == \"suave\" && remoting == true && deploy != \"azure\" && layout != \"none\")",
"rename": { "paket_noazure_remoting-fulma_suave-remoting-noazure.lock": "paket.lock" }
},
{
"include": "paket_azure_noremoting-nofulma_saturn-noremoting-azure.lock",
"condition": "(server == \"saturn\" && remoting == false && deploy == \"azure\" && layout == \"none\")",
"rename": { "paket_azure_noremoting-nofulma_saturn-noremoting-azure.lock": "paket.lock" }
},
{
"exclude": "**/paket-azure.lock",
"condition": "(server != \"saturn\" || remoting != false || deploy != \"azure\")"
"include": "paket_azure_noremoting-nofulma_giraffe-noremoting-azure.lock",
"condition": "(server == \"giraffe\" && remoting == false && deploy == \"azure\" && layout == \"none\")",
"rename": { "paket_azure_noremoting-nofulma_giraffe-noremoting-azure.lock": "paket.lock" }
},
{
"include": "paket_azure_noremoting-nofulma_suave-noremoting-azure.lock",
"condition": "(server == \"suave\" && remoting == false && deploy == \"azure\" && layout == \"none\")",
"rename": { "paket_azure_noremoting-nofulma_suave-noremoting-azure.lock": "paket.lock" }
},
{
"include": "paket_azure_remoting-nofulma_saturn-remoting-azure.lock",
"condition": "(server == \"saturn\" && remoting == true && deploy == \"azure\" && layout == \"none\")",
"rename": { "paket_azure_remoting-nofulma_saturn-remoting-azure.lock": "paket.lock" }
},
{
"include": "paket_azure_remoting-nofulma_giraffe-remoting-azure.lock",
"condition": "(server == \"giraffe\" && remoting == true && deploy == \"azure\" && layout == \"none\")",
"rename": { "paket_azure_remoting-nofulma_giraffe-remoting-azure.lock": "paket.lock" }
},
{
"include": "paket_azure_remoting-nofulma_suave-remoting-azure.lock",
"condition": "(server == \"suave\" && remoting == true && deploy == \"azure\" && layout == \"none\")",
"rename": { "paket_azure_remoting-nofulma_suave-remoting-azure.lock": "paket.lock" }
},
{
"include": "paket_azure_noremoting-fulma_saturn-noremoting-azure.lock",
"condition": "(server == \"saturn\" && remoting == false && deploy == \"azure\" && layout != \"none\")",
"rename": { "paket_azure_noremoting-fulma_saturn-noremoting-azure.lock": "paket.lock" }
},
{
"include": "paket_azure_noremoting-fulma_giraffe-noremoting-azure.lock",
"condition": "(server == \"giraffe\" && remoting == false && deploy == \"azure\" && layout != \"none\")",
"rename": { "paket_azure_noremoting-fulma_giraffe-noremoting-azure.lock": "paket.lock" }
},
{
"include": "paket_azure_noremoting-fulma_suave-noremoting-azure.lock",
"condition": "(server == \"suave\" && remoting == false && deploy == \"azure\" && layout != \"none\")",
"rename": { "paket_azure_noremoting-fulma_suave-noremoting-azure.lock": "paket.lock" }
},
{
"include": "paket_azure_remoting-fulma_saturn-remoting-azure.lock",
"condition": "(server == \"saturn\" && remoting == true && deploy == \"azure\" && layout != \"none\")",
"rename": { "paket_azure_remoting-fulma_saturn-remoting-azure.lock": "paket.lock" }
},
{
"include": "paket_azure_remoting-fulma_giraffe-remoting-azure.lock",
"condition": "(server == \"giraffe\" && remoting == true && deploy == \"azure\" && layout != \"none\")",
"rename": { "paket_azure_remoting-fulma_giraffe-remoting-azure.lock": "paket.lock" }
},
{
"include": "paket_azure_remoting-fulma_suave-remoting-azure.lock",
"condition": "(server == \"suave\" && remoting == true && deploy == \"azure\" && layout != \"none\")",
"rename": { "paket_azure_remoting-fulma_suave-remoting-azure.lock": "paket.lock" }
},


{
"exclude": "**/ServerSuave.fs",
"condition": "(server != \"suave\")"
},
{
"rename": {
"paket-azure.lock": "paket.lock"
"ServerSuave.fs": "Server.fs"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions Content/build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@ Target.create "RestoreServer" (fun _ ->

Target.create "Build" (fun _ ->
runDotNet "build" serverPath
runDotNet "fable --port free webpack -- -p" clientPath
runDotNet "fable webpack --port free -- -p" clientPath
)

Target.create "Run" (fun _ ->
let server = async {
runDotNet "watch run" serverPath
}
let client = async {
runDotNet "fable --port free webpack-dev-server" clientPath
runDotNet "fable webpack-dev-server --port free" clientPath
}
let browser = async {
do! Async.Sleep 5000
Expand Down
Loading