Merge pull request #450 from UN-OCHA/develop

[CD-270], [OPS-7442] CDv3 and core update

.travis.yml

@@ -1,4 +1,4 @@
-dist: trusty
+dist: bionic
 language: php
 cache:
   directories:
@@ -16,6 +16,9 @@ mysql:
   username: root
   encoding: utf8
 
+services:
+  - mysql
+
 env:
   global:
      - DRUPAL_REPO='git://drupalcode.org/project/drupal.git'
@@ -61,6 +64,9 @@ script:
   - # test ! -d ./html/themes/custom || ./vendor/bin/phpcs -p --report=full ./html/themes/custom
   - set +e
 
+  # Theme build.
+  - composer run sass
+
   # Run unit, kernel tests
   - # ./vendor/bin/phpunit --debug --colors --testsuite=unit,kernel
 

composer.json

@@ -84,15 +84,15 @@
         "drupal/twig_tweak": "^2.8",
         "drupal/variationcache": "^1.0",
         "drupal/viewsreference": "^2.0.0",
-        "drupal/webform": "^5.19",
+        "drupal/webform": "^5.25",
         "drush/drush": "^9.0.0",
         "npm-asset/select2": "^4.0",
         "oomphinc/composer-installers-extender": "^1.1",
         "phpoffice/phpspreadsheet": "1.11",
         "symfony/event-dispatcher": "4.3.3 as 3.4.41",
         "symfony/filesystem": "^3.4",
         "symfony/finder": "^3.4",
-        "unocha/common_design": "^2.8.9",
+        "unocha/common_design": "^4.0.0",
         "unocha/ocha_integrations": "^1.0",
         "vlucas/phpdotenv": "^2.4",
         "webflo/drupal-finder": "^1.0.0",
@@ -135,13 +135,13 @@
         "post-update-cmd": [
             "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
         ],
-        "gulp-prepare": "cd html/themes/custom/iasc_common_design && npm install",
-        "gulp-build": "cd html/themes/custom/iasc_common_design && ./node_modules/.bin/gulp build",
-        "gulp-cleanup": "cd html/themes/custom/iasc_common_design && rm -rf ./node_modules",
-        "gulp": [
-            "@gulp-prepare",
-            "@gulp-build",
-            "@gulp-cleanup"
+        "sass-prepare": "cd html/themes/custom/iasc_common_design && npm install",
+        "sass-build": "cd html/themes/custom/iasc_common_design && ./node_modules/.bin/sass sass:build",
+        "sass-cleanup": "cd html/themes/custom/iasc_common_design && rm -rf ./node_modules",
+        "sass": [
+            "@sass-prepare",
+            "@sass-build",
+            "@sass-cleanup"
         ]
 
     },