REFACTOR tooling

.env

@@ -0,0 +1 @@
+export MODE="production"

.gitignore

@@ -1,6 +1,6 @@
 assets/css
 assets/img/optimized
-dist
+build
 jekyll/assets/css
 jekyll/assets/img
 node_modules

bin/build.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+# shellcheck disable=SC1091
+
+source ./.env
+source ./bin/lib.sh
+
+log "🎬  Build start"
+
+imgBuild
+scssBuild
+jekyllBuild
+
+log "🏁  Build done"

bin/dev.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 # shellcheck disable=SC1091
 
+source ./.env
+export MODE="development"
 source ./bin/lib.sh
 
-browsersyncStart & imgWatch & scssWatchDev & jekyllWatchDev
+log "🎬  DEV start"
+
+browsersyncStart & imgWatch & scssWatch & jekyllWatch

bin/scss-build--dev.sh → bin/jekyll-build.sh

@@ -3,4 +3,4 @@
 
 source ./bin/lib.sh
 
-scssBuildDev
+jekyllBuild

bin/lib.sh

@@ -31,9 +31,9 @@ function cssCopyToJekyll() {
   cp ./assets/css/style.css.map ./jekyll/assets/css/style.css.map
 }
 
-function distCleanup() {
-  log "🗑️  DIST Clean-Up"
-  rm -rf dist
+function buildCleanup() {
+  log "🗑️  Build Clean-Up"
+  rm -rf build
 }
 
 function log() {
@@ -46,34 +46,26 @@ function logCleanup() {
   log "🗑️  LOG Clean-Up"
 }
 
-function scssWatchDev() {
+function scssWatch() {
   log "😳  SCSS watch"
   ./node_modules/.bin/nodemon \
     -e scss \
     --watch assets/scss \
-    -x ./bin/scss-build--dev.sh
+    --verbose \
+    -x ./bin/scss-build.sh
 }
 
-function scssBuildDev() {
+function scssBuild() {
   scssProcess
   postcssPrefix
   postcssCalc
   postcssFontvalues
   postcssObjectfit
   postcssSelectornot
   postcssCustomproperties
-  cssCopyToJekyll
-}
-
-function scssBuildDist() {
-  scssProcess
-  postcssPrefix
-  postcssCalc
-  postcssFontvalues
-  postcssObjectfit
-  postcssSelectornot
-  postcssCustomproperties
-  postcssO
+  if [ "$MODE" = "production" ]; then
+    postcssO
+  fi
   cssCopyToJekyll
 }
 

bin/lib/image.sh

@@ -54,6 +54,7 @@ function imgWatch() {
   ./node_modules/.bin/nodemon \
     -e jpeg,jpg,png,svg,gif \
     --watch assets/img/original \
+    --verbose \
     -x "./bin/img-build.sh"
 }
 

bin/lib/jekyll.sh

@@ -2,37 +2,28 @@
 # shellcheck disable=SC2154
 # shellcheck disable=SC2086
 
-function jekyllBuildDist() {
-  log "🏗️  JEKYLL build [DIST]"
-  bundle exec \
-    jekyll build \
-    --config jekyll_config_base.yml,jekyll_config_dist.yml
-}
-
-function jekyllBuildNetlify() {
-  log "🏗️  JEKYLL build [NETLIFY]"
-  bundle exec \
-    jekyll build \
-    --config jekyll_config_base.yml,jekyll_config_netlify.yml
-}
-
-function jekyllBuildDev() {
-  log "🏗️  JEKYLL build [DEV]"
-  bundle exec \
-    jekyll build \
-    --config jekyll_config_base.yml
-}
-
 function jekyllCleanup() {
   log "🗑️  JEKYLL Clean-Up"
   rm -r ./jekyll/assets/img/*
   rm -r ./jekyll/assets/css/*
 }
 
-function jekyllWatchDev() {
+function jekyllWatch() {
   log "😳  JEKYLL watch"
   ./node_modules/.bin/nodemon \
     -e md,html,css,js,png,jpg,jpeg,svg \
     --watch jekyll \
-    -x "./bin/jekyll-build--dev.sh; ./bin/browsersync-reload.sh;"
+    --verbose \
+    -x "./bin/jekyll-build.sh; ./bin/browsersync-reload.sh;"
+}
+
+function jekyllBuild() {
+  log "🏗️  JEKYLL build"
+  JEKYLL_CONF="jekyll_config_base.yml"
+  if [ "$MODE" = "production" ]; then
+    JEKYLL_CONF=$JEKYLL_CONF",jekyll_config_build.yml"
+  fi
+  bundle exec \
+    jekyll build \
+    --config $JEKYLL_CONF
 }

bin/predist.sh → bin/prebuild.sh

@@ -4,7 +4,7 @@
 source ./bin/lib.sh
 
 logCleanup
-distCleanup
+buildCleanup
 jekyllCleanup
 imgCleanup
-mkdir dist
+mkdir build

bin/predev.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 # shellcheck disable=SC1091
 
+source ./.env
+MODE=development
 source ./bin/lib.sh
 
 logCleanup

bin/scss-watch--dev.sh → bin/scss-build.sh

@@ -3,4 +3,4 @@
 
 source ./bin/lib.sh
 
-scssBuildDev
+scssBuild

jekyll_config_netlify.yml → jekyll_config_build.yml

@@ -1,2 +1,2 @@
 title: "GRO DSpaceCRIS Design 2017"
-destination: "dist"
+destination: "build"

package.json

@@ -2,9 +2,7 @@
   "name": "Mockup-Template",
   "version": "0.0.1",
   "description": "Lorem ipsum dolor sit amut.",
-  "contributors": [
-    "Nils Windisch"
-  ],
+  "contributors": ["Nils Windisch"],
   "homepage": "https://gro-dspacecris-design-2017.netlify.com/",
   "author": "Nils Windisch <[email protected]>",
   "devDependencies": {
@@ -80,10 +78,8 @@
     }
   },
   "scripts": {
-    "predist": "./bin/predist.sh",
-    "dist": "./bin/dist.sh",
-    "prenetlify": "./bin/prenetlify.sh",
-    "netlify": "./bin/netlify.sh",
+    "prebuild": "./bin/prebuild.sh",
+    "build": "./bin/build.sh",
     "predev": "./bin/predev.sh",
     "dev": "./bin/dev.sh",
     "sassdoc": "./bin/sassdoc.sh"