Merge branch 'feature/manage-compile' into 'develop'

Feature/manage compile

See merge request ASIP-Sante/esante-ressources!1

Author: Klee-scoisne

.docksal/commands/compile

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+## Compile styleguide and site based on src
+##
+## Usage: fin compile
+
+# Abort if anything fails
+set -e
+
+source "${PROJECT_ROOT}/.docksal/commands/helpers"
+
+#-------------------------- Execution --------------------------------
+
+# Site updating
+echo -e "${green_bg} Step 1 ${NC}${green} Compiling...${NC}"
+
+time -p compile
+
+echo -e "${green_bg} DONE! ${NC}${green} Completed all compiling steps.${NC}"
+
+#-------------------------- END: Execution --------------------------------

.docksal/commands/gulp

@@ -0,0 +1,26 @@
+#!/usr/bin/env sh
+
+#: exec_target = node
+
+## Execute gulp commands
+##
+## Usage: fin gulp
+
+# Abort if anything fails
+set -e
+
+source "${PROJECT_ROOT}/.docksal/commands/helpers"
+
+cd "${PROJECT_ROOT}"
+
+if [ ! -d "node_modules" ]
+then
+  echo_yellow "Node modules don't exist."
+  echo_green "Installing node modules..."
+
+  npm ci
+fi
+
+#-------------------------- Execution --------------------------------
+
+./node_modules/.bin/gulp ${@}

.docksal/commands/helpers

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+## Define helpers for others scripts.
+##
+## No "fin" usage.
+
+#-------------------------- Settings --------------------------------
+
+PROJECT_ROOT="/var/www"
+
+#-------------------------- END: Settings --------------------------------
+
+#-------------------------- Helper functions --------------------------------
+
+# Console colors
+red='\033[0;31m'
+green='\033[0;32m'
+green_bg='\033[1;97;42m'
+lavender_bg='\033[1;30;0;44m'
+yellow='\033[1;33m'
+NC='\033[0m'
+
+echo_red () { echo -e "${red}$1${NC}"; }
+echo_green () { echo -e "${green}$1${NC}"; }
+echo_green_bg () { echo -e "${green_bg}$1${NC}"; }
+echo_lavender_bg () { echo -e "${lavender_bg}$1${NC}"; }
+echo_yellow () { echo -e "${yellow}$1${NC}"; }
+
+
+# Compile SCSS
+compile ()
+{
+  #echo_green "Compiling"
+  fin gulp
+}
+
+#-------------------------- END: Helper functions --------------------------------

.docksal/commands/init

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+## Initialize stack and site (full reset)
+##
+## Usage: fin init
+
+# Abort if anything fails
+set -e
+
+source "${PROJECT_ROOT}/.docksal/commands/helpers"
+
+#-------------------------- Execution --------------------------------
+
+# Stack initialization
+echo -e "${green_bg} Step 1 ${NC}${green} Initializing stack...${NC}"
+fin project reset -f
+
+# Site initialization
+echo -e "${green_bg} Step 2 ${NC}${green} Initializing site...${NC}"
+
+time -p compile
+
+echo -e "${green_bg} DONE! ${NC}${green} Completed all initialization steps.${NC}"
+
+#-------------------------- END: Execution --------------------------------

.docksal/commands/npm

@@ -0,0 +1,18 @@
+#!/usr/bin/env sh
+
+#: exec_target = node
+
+## Execute npm commands
+##
+## Usage: fin npm
+
+# Abort if anything fails
+set -e
+
+source "${PROJECT_ROOT}/.docksal/commands/helpers"
+
+cd "${PROJECT_ROOT}"
+
+#-------------------------- Execution --------------------------------
+
+npm ${@}

.docksal/docksal.env

@@ -10,5 +10,10 @@
 
 # Override virtual host (matches project folder name by default)
 VIRTUAL_HOST=esante-ressources.docksal.site
+
+# Lock images versions for LAMP services
+# This will prevent images from being updated when Docksal is updated
+NODE_IMAGE='node:12-alpine'
+
 # Override document root ('docroot' by default)
-DOCROOT=web/styleguide
+DOCROOT=styleguide

.docksal/docksal.yml

@@ -8,3 +8,16 @@ services:
       - "${VIRTUAL_HOST}:${DOCKSAL_HOST_IP}"
     labels:
       - io.docksal.virtual-host=${VIRTUAL_HOST},*.${VIRTUAL_HOST},${VIRTUAL_HOST}.*
+
+  # Compile sources
+  node:
+    image: ${NODE_IMAGE}
+    volumes:
+      - project_root:/var/www:rw,nocopy,cached  # Project root volume
+    labels:
+      - io.docksal.user=node
+      - io.docksal.shell=sh
+      - io.docksal.project-root=${PROJECT_ROOT}
+    environment:
+     - PROJECT_ROOT=/var/www
+    command: tail -F anything

.gitignore

@@ -1 +1,7 @@
-.idea
+.idea
+
+node_modules
+
+# Generated folders by gulp compilation
+site
+styleguide

.gitlab-ci.yml

@@ -33,26 +33,21 @@ stages:
 # Build job.
 ################################################################################
 
-#css-build:
-#  stage: build
-#  needs: []
-#  extends:
-#    - .node_image
-#    - .build_rules
-#  variables:
-#    FOLDERS: g_nius
-#  script:
-#    - |
-#      for FOLDER in $FOLDERS
-#        do
-#          cd ${CI_PROJECT_DIR}/web/themes/custom/${FOLDER}
-#          npm ci
-#          npm run prod:css
-#        done
-#  artifacts:
-#    paths:
-#      - web/themes/custom/g_nius/css
-#    expire_in: 1 hour
+build:site:
+  stage: build
+  needs: []
+  extends:
+    - .node_image
+    - .build_rules
+  before_script:
+    - npm ci
+  script:
+    - ./node_modules/.bin/gulp
+  artifacts:
+    paths:
+      - web/site
+      - web/styleguide
+    expire_in: 1 hour
 
 ################################################################################
 # Code quality jobs.
@@ -122,8 +117,8 @@ stages:
 
 generate_package:
   stage: build
-  needs: []
-  dependencies: []
+  needs: ["build:site"]
+  dependencies: ["build:site"]
   extends:
     - .ressources_variables
     - .tags_rules

.gitlab/ci/images.yml

@@ -6,4 +6,4 @@
 ################################################################################
 
 .node_image:
-  image: node:16.14-alpine
+  image: node:12-alpine