Merge branch 'master' into update_dtrader_url

Author: ahmadtaimoor-deriv

build/aliases.yaml

@@ -64,3 +64,4 @@ release:
 releaseci:
   - 'default'
   - 'shell:compile_production'
+  - 'hashres'

build/copy.js

@@ -13,9 +13,6 @@ module.exports = function (grunt) {
                 { expand: true, cwd: 'src/download/fonts', src: ['binary_symbols.woff'], dest: `${global.dist}/download/fonts/` },
 
                 { expand: true, src: ['favicon.ico'], dest: global.dist },
-
-                // Serve pushwoosh SDKs
-                { expand: true, cwd: 'src/javascript/_common/lib/pushwooshSDK/', src: ['**'], dest: global.dist },
                 { expand: true, cwd: 'src/root_files/app', src: ['**', '!index.html'], dest: 'dist' }, // top level
                 { expand: true, cwd: 'src/root_files/app', src: ['index.html'],        dest: global.dist },
 

build/hashres.js

@@ -0,0 +1,18 @@
+module.exports = {
+  options: {
+    encoding: "utf8",
+    length: 8,
+    algorithm: "md5",
+    renameFiles: false,
+    fileNameFormat: "${name}.${ext}?${hash}",
+  },
+  main: {
+    src: [
+      "dist/css/*.css",
+      "dist/js/**/*.js",
+      "dist/images/**/*.{png,jpg,jpeg,gif,webp,svg}",
+      "!dist/images/common/logos/icon_deriv.svg",
+    ],
+    dest: "dist/**/*.html",
+  },
+};

build/postcss.js

@@ -2,7 +2,13 @@ module.exports = function (grunt) {
     return {
         options: {
             processors: [
-                require('autoprefixer')()
+                require('autoprefixer')(),
+                require('postcss-cachebuster')({
+                    supportedProps: [
+                        'background',
+                        'background-image',
+                    ],
+                }),
             ],
         },
         dist: {

build/webpack/plugins.js

@@ -1,4 +1,5 @@
 const CircularDependencyPlugin = require('circular-dependency-plugin');
+const CryptoJS   = require('crypto-js');
 const path                     = require('path');
 const webpack                  = require('webpack');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
@@ -47,7 +48,8 @@ const getPlugins = (app, grunt) => ([
 
             new webpack.DefinePlugin({
                 'process.env': {
-                    NODE_ENV: JSON.stringify('production'),
+                    BUILD_HASH: JSON.stringify(CryptoJS.MD5(Date.now().toString()).toString()),
+                    NODE_ENV  : JSON.stringify('production'),
                 },
             }),
         ]

package-lock.json

@@ -69,6 +69,7 @@
     "grunt-contrib-watch": "1.1.0",
     "grunt-eslint": "24.3.0",
     "grunt-gh-pages": "4.0.0",
+    "grunt-hashres": "^0.4.1",
     "grunt-mocha-test": "0.13.3",
     "grunt-notify": "0.4.5",
     "grunt-postcss": "^0.9.0",
@@ -102,10 +103,11 @@
     "@babel/polyfill": "7.12.1",
     "@binary-com/binary-document-uploader": "^2.4.4",
     "@binary-com/binary-style": "^0.2.26",
-    "@binary-com/webtrader-charts": "0.5.21",
+    "@binary-com/webtrader-charts": "0.5.22",
     "@livechat/customer-sdk": "4.0.2",
     "canvas-toBlob": "1.0.0",
     "classnames": "2.2.5",
+    "crypto-js": "^4.2.0",
     "custom-event-polyfill": "0.3.0",
     "davidshimjs-qrcodejs": "0.0.2",
     "event-source-polyfill": "0.0.9",
@@ -116,6 +118,7 @@
     "js-yaml": "4.1.0",
     "kinetic": "5.2.0",
     "moment": "^2.29.4",
+    "postcss-cachebuster": "^0.1.6",
     "promise-polyfill": "6.1.0",
     "prop-types": "^15.8.1",
     "react": "16.14.0",