Merge branch 'develop'

web/gulpfile.js

@@ -1,6 +1,6 @@
 const gulp = require('gulp');
 const plumber = require('gulp-plumber');
-const sass = require('gulp-sass');
+const sass = require('gulp-sass')(require('sass'));
 const autoprefixer = require('gulp-autoprefixer');
 const rtlcss = require('gulp-rtlcss');
 const rename = require('gulp-rename');

web/package.json

@@ -35,7 +35,7 @@
     "leaflet.tilelayer.colorfilter": "^1.2.5",
     "lodash": "^4.17.20",
     "moment": "^2.28.0",
-    "node-sass": "^4.14.1",
+    "node-sass": "^6.0.1",
     "plyr": "^3.6.2",
     "prism-react-renderer": "^0.1.7",
     "prism-themes": "^1.4.0",
@@ -97,8 +97,9 @@
     "gulp-plumber": "^1.2.1",
     "gulp-rename": "^1.4.0",
     "gulp-rtlcss": "^1.4.1",
-    "gulp-sass": "^4.1.0",
+    "gulp-sass": "^5.0.0",
     "gulp-sourcemaps": "^2.6.5",
-    "prettier": "1.17.1"
+    "prettier": "1.17.1",
+    "sass": "^1.43.4"
   }
 }