[WIP] Use case names instead of literals for class names

.paket/Paket.Restore.targets

@@ -17,23 +17,43 @@
     <PaketExeImage Condition=" '$(PaketBootstrapperStyle)' == 'proj' ">native</PaketExeImage>
     <MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
     <MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
-    <!-- Paket command -->
-    <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketToolsPath)paket')">$(PaketToolsPath)paket</PaketExePath>
-    <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath>
 
-    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' ">$(PaketToolsPath)paket.exe</PaketExePath>
-    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketExeImage)' == 'assembly' ">$(PaketToolsPath)paket.exe</PaketExePath>
-    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketExeImage)' == 'native' ">$(PaketToolsPath)paket</PaketExePath>
+    <!-- PaketBootStrapper  -->
+    <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
+    <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
+    <PaketBootStrapperExeDir Condition=" Exists('$(PaketBootStrapperExePath)') " >$([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\</PaketBootStrapperExeDir>
+
+    <!-- Paket -->
+
+    <!-- windows, root => tool => proj style => bootstrapper => global -->
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND Exists('$(PaketRootPath)paket.exe') ">$(PaketRootPath)paket.exe</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND Exists('$(PaketToolsPath)paket.exe') ">$(PaketToolsPath)paket.exe</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND '$(PaketBootstrapperStyle)' == 'proj' ">$(PaketToolsPath)paket.exe</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND Exists('$(PaketBootStrapperExeDir)') ">$(_PaketBootStrapperExeDir)paket.exe</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' ">paket.exe</PaketExePath>
+
+    <!-- no windows, try native paket as default,  root => tool => proj style => mono paket => bootstrpper => global -->
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketRootPath)paket') ">$(PaketRootPath)paket</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketToolsPath)paket') ">$(PaketToolsPath)paket</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketBootstrapperStyle)' == 'proj' ">$(PaketToolsPath)paket</PaketExePath>
+
+    <!-- no windows, try mono paket -->
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketRootPath)paket.exe') ">$(PaketRootPath)paket.exe</PaketExePath>
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketToolsPath)paket.exe') ">$(PaketToolsPath)paket.exe</PaketExePath>
+
+    <!-- no windows, try bootstrapper -->
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketBootStrapperExeDir)') ">$(PaketBootStrapperExeDir)paket.exe</PaketExePath>
+
+    <!-- no windows, try global native paket -->
+    <PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' ">paket</PaketExePath>
 
     <!-- Paket command -->
     <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
     <PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
-    <PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
     <PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' != 'Windows_NT' AND '$(_PaketExeExtension)' == '.exe' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
-    <PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' != 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
+    <PaketCommand Condition=" '$(PaketCommand)' == '' ">"$(PaketExePath)"</PaketCommand>
+
 
-    <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
-    <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
     <PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
 
@@ -42,6 +62,9 @@
     <!-- see https://github.com/fsharp/fslang-design/blob/master/RFCs/FS-1032-fsharp-in-dotnet-sdk.md -->
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
+
+    <!-- Disable Paket restore under NCrunch build -->
+    <PaketRestoreDisabled Condition="'$(NCrunch)' == '1'">True</PaketRestoreDisabled>
   </PropertyGroup>
 
   <Target Name="PaketBootstrapping" Condition="Exists('$(PaketToolsPath)paket.bootstrapper.proj')">
@@ -82,7 +105,11 @@
       <PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
     </PropertyGroup>
 
-    <PropertyGroup Condition="'$(PaketPropsVersion)' != '5.174.2' ">
+	<!-- 
+		This value should match the version in the props generated by paket 
+		If they differ, this means we need to do a restore in order to ensure correct dependencies
+	-->
+    <PropertyGroup Condition="'$(PaketPropsVersion)' != '5.185.3' ">
       <PaketRestoreRequired>true</PaketRestoreRequired>
     </PropertyGroup>
 
@@ -163,6 +190,7 @@
         <ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' == '6' And %(PaketReferencesFileLinesInfo.CopyLocal) == 'false'">runtime</ExcludeAssets>
         <ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' != '6' And %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
         <Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
+        <AllowExplicitVersion>true</AllowExplicitVersion>
       </PackageReference>
     </ItemGroup>
 

Settings.FSharpLint

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FSharpLintSettings>
+    <Analysers>
+        <Typography>
+            <Rules>
+                <MaxCharactersOnLine>
+                    <Enabled>true</Enabled>
+                    <Length>120</Length>
+                </MaxCharactersOnLine>
+                <TrailingWhitespaceOnLine>
+                    <Enabled>true</Enabled>
+                </TrailingWhitespaceOnLine>
+            </Rules>
+        </Typography>
+        <NestedStatements>
+            <Enabled>true</Enabled>
+            <Depth>8</Depth>
+        </NestedStatements>
+        <NumberOfItems>
+            <Rules>
+                <MaxNumberOfMembers>
+                    <Enabled>false</Enabled>
+                    <MaxItems>32</MaxItems>
+                </MaxNumberOfMembers>
+            </Rules>
+            <Enabled>true</Enabled>
+        </NumberOfItems>
+        <SourceLength>
+            <Rules>
+                <MaxLinesInFunction>
+                    <Enabled>false</Enabled>
+                </MaxLinesInFunction>
+                <MaxLinesInLambdaFunction>
+                    <Enabled>true</Enabled>
+                    <Lines>7</Lines>
+                </MaxLinesInLambdaFunction>
+                <MaxLinesInMatchLambdaFunction>
+                    <Enabled>false</Enabled>
+                </MaxLinesInMatchLambdaFunction>
+                <MaxLinesInValue>
+                    <Enabled>false</Enabled>
+                </MaxLinesInValue>
+                <MaxLinesInConstructor>
+                    <Enabled>false</Enabled>
+                </MaxLinesInConstructor>
+                <MaxLinesInMember>
+                    <Enabled>false</Enabled>
+                </MaxLinesInMember>
+                <MaxLinesInProperty>
+                    <Enabled>false</Enabled>
+                    <Lines>70</Lines>
+                </MaxLinesInProperty>
+                <MaxLinesInClass>
+                    <Enabled>false</Enabled>
+                </MaxLinesInClass>
+                <MaxLinesInEnum>
+                    <Enabled>false</Enabled>
+                </MaxLinesInEnum>
+                <MaxLinesInUnion>
+                    <Enabled>false</Enabled>
+                </MaxLinesInUnion>
+                <MaxLinesInRecord>
+                    <Enabled>false</Enabled>
+                </MaxLinesInRecord>
+                <MaxLinesInModule>
+                    <Enabled>false</Enabled>
+                </MaxLinesInModule>
+            </Rules>
+            <Enabled>true</Enabled>
+        </SourceLength>
+        <Formatting>
+            <Rules>
+                <TupleParentheses>
+                    <Enabled>false</Enabled>
+                </TupleParentheses>
+                <UnionDefinitionIndentation>
+                    <Enabled>false</Enabled>
+                </UnionDefinitionIndentation>
+            </Rules>
+        </Formatting>
+    </Analysers>
+</FSharpLintSettings>

build.fsx

@@ -59,6 +59,7 @@ Target.create "Install" (fun _ ->
 
 Target.create "Build" (fun _ ->
     !! "src/**/*.fsproj"
+    -- "src/Fulma.Extensions/*"
     |> Seq.iter (fun s ->
         let dir = IO.Path.GetDirectoryName s
         DotNet.build id dir)
@@ -154,7 +155,7 @@ Target.create "PublishNugets" (fun _ ->
     ++ "src/Fable.FontAwesome.Free/Fable.FontAwesome.Free.fsproj"
     ++ "src/Fable.FontAwesome.Pro/Fable.FontAwesome.Pro.fsproj"
     ++ "src/Fulma/Fulma.fsproj"
-    ++ "src/Fulma.Extensions/Fulma.Extensions.fsproj"
+    // ++ "src/Fulma.Extensions/Fulma.Extensions.fsproj"
     ++ "src/Fulma.Extensions.Wikiki.Calendar/Fulma.Extensions.Wikiki.Calendar.fsproj"
     ++ "src/Fulma.Extensions.Wikiki.Checkradio/Fulma.Extensions.Wikiki.Checkradio.fsproj"
     ++ "src/Fulma.Extensions.Wikiki.Divider/Fulma.Extensions.Wikiki.Divider.fsproj"

docs/src/Fulma/Layout/Columns.fs

@@ -90,7 +90,7 @@ type GapSize(props) =
                                         this.SetSize size
                                       )
                                       Style [ Cursor "pointer" ] ] ]
-                    [ str ("is-" + Columns.ISize.toString size) ]
+                    [ str (Fable.Core.Reflection.getCaseName size) ]
             )
             |> Tag.list [ ]
 

docs/src/Fulma/Modifiers/Responsive.fs

@@ -10,10 +10,10 @@ let demo() =
                 [ str "Visibile only on mobile" ] ]
           Message.message [ ]
             [ Message.body [ Modifiers [ Modifier.IsHidden (Screen.Desktop, true) ] ]
-                [ str "Visibile only on for touch screens" ] ]
+                [ str "Visibile only on touch screens" ] ]
           Message.message [ ]
             [ Message.body [ Modifiers [ Modifier.IsHiddenOnly (Screen.Desktop, true) ] ]
-                [ str "Hidden only on for desktop" ] ]
+                [ str "Hidden only on desktop" ] ]
           Message.message [ ]
             [ Message.body [ Modifiers [ Modifier.IsHidden (Screen.Mobile, true) ] ]
                 [ str "Hidden only on mobile" ] ] ]

docs/src/FulmaElmish/DatePicker.fs

@@ -40,7 +40,8 @@ type DatePickerDemo(props) =
 
     override this.render () =
         let datePickerView =
-                DatePicker.View.root pickerConfig this.state.DatePickerState this.state.CurrentDate this.datePickerChanged
+            str "todo"
+            // DatePicker.View.root pickerConfig this.state.DatePickerState this.state.CurrentDate this.datePickerChanged
 
         let dateText =
             match this.state.CurrentDate with

docs/src/FulmaExtensions/Divider.fs

@@ -7,27 +7,27 @@ open Fulma.Extensions.Wikiki
 
 let basicInteractive () =
     div [ ]
-        [ div [ ClassName TextAlignment.Classes.HasTextCentered ]
+        [ Text.div [ Modifiers [ Modifier.TextAlignment (Screen.All, TextAlignment.Centered) ] ]
               [ Heading.h1 [ ]
                     [ str "Top" ] ]
           Divider.divider [ ]
-          div [ ClassName TextAlignment.Classes.HasTextCentered ]
+          Text.div [ Modifiers [ Modifier.TextAlignment (Screen.All, TextAlignment.Centered) ] ]
               [ Heading.h1 [ ]
                     [ str "Middle" ] ]
           Divider.divider [ Divider.Label "OR" ]
-          div [ ClassName TextAlignment.Classes.HasTextCentered ]
+          Text.div [ Modifiers [ Modifier.TextAlignment (Screen.All, TextAlignment.Centered) ] ]
               [ Heading.h1 [ ]
                     [ str "Bottom" ] ] ]
 
 let verticalInteractive () =
      Columns.columns [ ]
-        [ Column.column [ Column.Modifiers [ Modifier.TextAlignment (Screen.All, TextAlignment.Centered) ]  ]
+        [ Column.column [ Column.Modifiers [ Modifier.TextAlignment (Screen.All, TextAlignment.Centered) ] ]
               [ Heading.h1 [ ]
                     [ str "Left"] ]
           Column.column [ ]
               [ Divider.divider [ Divider.Label "OR"
                                   Divider.IsVertical ] ]
-          Column.column [ Column.Modifiers [ Modifier.TextAlignment (Screen.All, TextAlignment.Centered) ]  ]
+          Column.column [ Column.Modifiers [ Modifier.TextAlignment (Screen.All, TextAlignment.Centered) ] ]
               [ Heading.h1 [ ]
                     [ str "Right" ] ] ]
 

docs/webpack.config.js

@@ -51,7 +51,7 @@ module.exports = {
     mode: isProduction ? "production" : "development",
     output: {
         path: path.join(__dirname, './public'),
-        filename: isProduction ? '[name].js' : '[name].js'
+        filename: isProduction ? '[name].js' : '[name].[hash].js'
     },
     optimization: {
         // Split the code coming from npm packages into a different file.
@@ -63,7 +63,7 @@ module.exports = {
                     name: "vendors",
                     chunks: "all"
                 }
-            }
+            },
         },
     },
     plugins: isProduction ?

paket.lock

@@ -1,7 +1,7 @@
 STORAGE: NONE
 NUGET
   remote: https://www.nuget.org/api/v2
-    Fable.Core (2.0.2)
+    Fable.Core (2.0.3)
       FSharp.Core (>= 4.5.2) - restriction: >= netstandard2.0
     Fable.Elmish (2.0.3)
       Fable.Core (>= 2.0) - restriction: >= netstandard2.0