#17 - Minifying css, converting custom.css to scss, setting up grunt …

…pipeline for scss conversion and css minification, adding option for release vs debug mode build with configuring to use the proper variant, remove unused bulma scss files from the repo
intellifactory · Jan 22, 2021 · fb46472 · fb46472
1 parent 6d98453
commit fb46472
Show file tree

Hide file tree

Showing 14 changed files with 537 additions and 487 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,7 @@
 /.ionide
 *.bak*
 *.done
+*.min.css
+*.map
+src/Hosted/assets/custom.css
+*.ionide*
diff --git a/build.ps1 b/build.ps1
@@ -1,10 +1,10 @@
 echo "Copy legal files"
 
-xcopy .\legal\site-docs\intellifactory.com\* .\src\Hosted\legal\ /s /e
+xcopy .\legal\site-docs\intellifactory.com\* .\src\Hosted\legal\ /s /e /y
 
 echo "Copy blog posts files"
 
-xcopy .\blogs\user\* .\src\Hosted\posts\ /s /e
+xcopy .\blogs\user\* .\src\Hosted\posts\ /s /e /y
 
 echo "Running npm install" 
 
@@ -14,4 +14,12 @@ popd
 
 echo "Running dotnet build"
 
-dotnet build SiteFi.sln
+$mode=$args[0]
+echo "Param $mode"
+if ($mode -ieq "debug") {
+    echo "Running build in Debug mode..."
+    dotnet build SiteFi.sln -c Debug
+} else {
+    echo "Running build in Release mode..."
+    dotnet build SiteFi.sln
+}
diff --git a/build.sh b/build.sh
@@ -20,5 +20,10 @@ popd
 
 echo "Running dotnet build"
 
-dotnet build SiteFi.sln
+if ["{$1^^}" -eq "DEBUG"]
+then
+    dotnet build SiteFi.sln -c Debug
+else
+    dotnet build SiteFi.sln
+fi
 
diff --git a/src/Hosted/Gruntfile.js b/src/Hosted/Gruntfile.js
@@ -4,8 +4,30 @@ module.exports = function(grunt) {
 	grunt.initConfig({
 	    cssmin: {
 			build: {
-			  src: 'css/all.css',
-			  dest: 'css/all.min.css'
+				files: [{
+					expand: true,
+					cwd: 'assets',
+					src: ['*.css', '!*.min.css'],
+					dest: 'assets',
+					ext: '.min.css'
+				  }, {
+					expand: true,
+					cwd: 'themekit/css',
+					src: ['*.css', '!*.min.css'],
+					dest: 'themekit/css',
+					ext: '.min.css'
+				  }]
+			}
+		},
+		sass: {
+			options: {
+				implementation: sass,
+				sourceMap: true
+			},
+			dist: {
+				files: {
+					'assets/custom.css': 'assets/custom.scss'
+				}
 			}
 		}
 	});
@@ -14,5 +36,5 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-contrib-uglify');
 	grunt.loadNpmTasks('grunt-contrib-cssmin');
 
-	grunt.registerTask('default', ['cssmin']);
+	grunt.registerTask('default', ['sass','cssmin']);
 };
diff --git a/src/Hosted/Hosted.fsproj b/src/Hosted/Hosted.fsproj
@@ -6,7 +6,6 @@
 
   <ItemGroup>
     <Content Include="posts/**/*.*" />
-    <Content Include="scss/**/*.*" />
     <Compile Include="Main.fs" />
     <Compile Include="Startup.fs" />
     <Content Include="404.html" />

diff --git a/src/Hosted/Main.fs b/src/Hosted/Main.fs
@@ -911,6 +911,9 @@ module Site =
                     .Map(client <@ ClientSideCode.TalksAndPresentations.GMap(mapStyles) @>)
                     .Doc()
             TrainingsTemplate()
+#if !DEBUG
+                .ReleaseMin(".min")
+#endif
                 .MenuBar(menubar config.Value)
                 .HeaderContent(header)
                 .Footer(MainTemplate.Footer().Doc())
@@ -919,6 +922,9 @@ module Site =
             |> Content.Page
         let TERMSOFUSE (ctx: Context<_>) =
             LegalTemplate()
+#if !DEBUG
+                .ReleaseMin(".min")
+#endif
                 .MenuBar(menubar config.Value)
                 .HeaderContent(Doc.Empty)
                 .Content(Doc.Verbatim <| Markdown.Convert (getContent ctx "TermsOfUse.md"))
@@ -950,6 +956,9 @@ module Site =
         let CONTACT () =
             let mapContactStyles = mapContactStyles()
             ContactTemplate()
+#if !DEBUG
+                .ReleaseMin(".min")
+#endif
                 .MenuBar(menubar config.Value)
                 .Map(client <@ ClientSideCode.TalksAndPresentations.GMapOffice(mapContactStyles) @>)
                 .Footer(MainTemplate.Footer().Doc())
@@ -958,27 +967,39 @@ module Site =
             |> Content.Page
         let RESEARCH () = 
             ResearchTemplate()
+#if !DEBUG
+                .ReleaseMin(".min")
+#endif    
                 .MenuBar(menubar config.Value)
                 .Footer(MainTemplate.Footer().Doc())
                 .Cookie(Cookies.Banner false)
                 .Doc()
             |>Content.Page
         let CONSULTING () =
             ConsultingTemplate()
+#if !DEBUG
+                .ReleaseMin(".min")
+#endif
                 .MenuBar(menubar config.Value)
                 .Footer(MainTemplate.Footer().Doc())
                 .Cookie(Cookies.Banner false)
                 .Doc()
             |>Content.Page
         let CAREERS () = 
             CareersTemplate()
+#if !DEBUG
+                .ReleaseMin(".min")
+#endif
                 .MenuBar(menubar config.Value)
                 .Footer(MainTemplate.Footer().Doc())
                 .Cookie(Cookies.Banner false)
                 .Doc()
             |>Content.Page
         let OPENPOSITION () = 
             OpenPositionTemplate()
+#if !DEBUG
+                .ReleaseMin(".min")
+#endif    
                 .MenuBar(menubar config.Value)
                 .Footer(MainTemplate.Footer().Doc())
                 .Cookie(Cookies.Banner false)
@@ -1004,6 +1025,9 @@ module Site =
                 let isFirst = pageNo = 1
                 let isLast = List.length as1 - pageNo < 1
                 BlogListTemplate()
+#if !DEBUG
+                    .ReleaseMin(".min")
+#endif
                     .Menubar(menubar config.Value)
                     .Banner(banner)
                     .ArticleList(ARTICLES articles)