Merge pull request #25 from UN-OCHA/develop

[CD-270],[OPS-7442] Common Design v3 and core security update

.editorconfig

@@ -13,8 +13,5 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[composer*.{json,lock}]
+[composer.{json,lock}]
 indent_size = 4
-
-[Makefile]
-indent_style = tab

.github/workflows/docker-build-image.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - develop
+      - 'feature/**'
       - main
   release:
     types: [published]
@@ -21,7 +22,8 @@ jobs:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
       run: |
-        export DOCKER_TAG="${GITHUB_REF##*/}"
+        export DOCKER_TAG="${GITHUB_REF#refs/*/}"
+        export DOCKER_TAG=${DOCKER_TAG//[^[:alnum:].-]/-}
         echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin
         docker build \
             --build-arg BRANCH_ENVIRONMENT=${BRANCH_ENVIRONMENT} \

.travis.yml

@@ -1,4 +1,4 @@
-dist: trusty
+dist: bionic
 language: php
 cache:
   - composer
@@ -9,6 +9,9 @@ addons:
 php:
   - 7.3
 
+services:
+  - mysql
+
 mysql:
   database: drupal
   username: root
@@ -48,6 +51,9 @@ script:
   - ./vendor/bin/phpcs --config-set installed_paths vendor/drupal/coder/coder_sniffer
   - test ! -d ./html/modules/custom || ./vendor/bin/phpcs -p --report=full ./html/modules/custom
 
+  # Theme build.
+  - composer run sass
+
   # Drupal install
   - mysql -e "CREATE DATABASE drupal;"
   - mysql -e "GRANT ALL ON drupal.* to [email protected] IDENTIFIED BY 'drupal';"

composer.json

@@ -27,7 +27,7 @@
         "drupal/admin_denied": "^1.0",
         "drupal/allowed_formats": "^1.2",
         "drupal/bcc": "^3.0@beta",
-        "drupal/components": "^2.0-beta3",
+        "drupal/components": "^2.4",
         "drupal/config_split": "^1.4",
         "drupal/core-composer-scaffold": "^8.8",
         "drupal/core-dev": "^8.8",
@@ -50,7 +50,7 @@
         "oomphinc/composer-installers-extender": "^1.1.2",
         "phpoffice/phpspreadsheet": "^1.14.1",
         "symfony/flex": "^1.10",
-        "unocha/common_design": "^2.8.9",
+        "unocha/common_design": "^4.0.0",
         "webflo/drupal-finder": "^1.0.0",
         "zaporylie/composer-drupal-optimizations": "^1.1.1"
     },
@@ -97,13 +97,13 @@
             "@drupal-scaffold"
         ],
         "drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
-        "gulp-prepare": "cd html/themes/custom/common_design_subtheme && npm install",
-        "gulp-build": "cd html/themes/custom/common_design_subtheme && ./node_modules/.bin/gulp build",
-        "gulp-cleanup": "cd html/themes/custom/common_design_subtheme && rm -rf ./node_modules",
-        "gulp": [
-            "@gulp-prepare",
-            "@gulp-build",
-            "@gulp-cleanup"
+        "sass-prepare": "cd html/themes/custom/common_design_subtheme && npm install",
+        "sass-build": "cd html/themes/custom/common_design_subtheme && ./node_modules/.bin/sass sass:build",
+        "sass-cleanup": "cd html/themes/custom/common_design_subtheme && rm -rf ./node_modules",
+        "sass": [
+            "@sass-prepare",
+            "@sass-build",
+            "@sass-cleanup"
         ]
     },
     "extra": {