Merge commit '387276f2f33a0fb9dde01434387aac9cdc9a8472' into firmware-proxy

# Conflicts:
#	components/wifi-manager/webapp/webapp.cmake
#	components/wifi-manager/webapp/webpack.c
#	components/wifi-manager/webapp/webpack.h
#	components/wifi-manager/webapp/webpack/dist/index.html
#	components/wifi-manager/webapp/webpack/dist/index.html.br
#	components/wifi-manager/webapp/webpack/dist/index.html.gz
#	components/wifi-manager/webapp/webpack/dist/js/index.18c3b7.bundle.js
#	components/wifi-manager/webapp/webpack/dist/js/index.abeafc.bundle.js
#	components/wifi-manager/webapp/webpack/dist/js/index.cf3fe8.bundle.js
#	components/wifi-manager/webapp/webpack/dist/js/node-modules.18c3b7.bundle.js
#	components/wifi-manager/webapp/webpack/dist/js/node-modules.abeafc.bundle.js
#	components/wifi-manager/webapp/webpack/dist/js/node-modules.cf3fe8.bundle.js
#	components/wifi-manager/webapp/webpack/dist/js/node-modules.cf3fe8.bundle.js.br
#	components/wifi-manager/webapp/webpack/dist/js/node-modules.cf3fe8.bundle.js.gz
#	components/wifi-manager/webapp/webpack/dist/js/runtime.18c3b7.bundle.js
#	components/wifi-manager/webapp/webpack/dist/js/runtime.18c3b7.bundle.js.br
#	components/wifi-manager/webapp/webpack/dist/js/runtime.18c3b7.bundle.js.gz
#	components/wifi-manager/webapp/webpack/dist/js/runtime.abeafc.bundle.js
#	components/wifi-manager/webapp/webpack/dist/js/runtime.abeafc.bundle.js.br
#	components/wifi-manager/webapp/webpack/dist/js/runtime.abeafc.bundle.js.gz
#	components/wifi-manager/webapp/webpack/dist/js/runtime.cf3fe8.bundle.js
#	components/wifi-manager/webapp/webpack/dist/js/runtime.cf3fe8.bundle.js.br
#	components/wifi-manager/webapp/webpack/dist/js/runtime.cf3fe8.bundle.js.gz

components/wifi-manager/webapp/webpack/webpack.common.js

@@ -11,6 +11,8 @@ const ESLintPlugin = require('eslint-webpack-plugin');
 const SpriteLoaderPlugin = require('svg-sprite-loader/plugin');
 // Linting
 const TSLintPlugin = require('tslint-webpack-plugin');
+const ImageminPlugin = require('imagemin-webpack-plugin').default;
+const imageminMozjpeg = require('imagemin-mozjpeg');
 
 
 module.exports = {
@@ -97,9 +99,10 @@ module.exports = {
                         loader: 'url-loader',
                         options: {
                            // publicPath: '../',
-                            name: './assets/images/' + '[name].[ext]',
+                            //name: './assets/images/' + '[name].[ext]',
                             limit: 10000,
-                            publicPath: '../'
+                            //limit:false,
+                            //publicPath: '../'
                         }
 
                     },
@@ -177,6 +180,22 @@ module.exports = {
 
     plugins: [
       new CleanWebpackPlugin(),
+      new ImageminPlugin({
+          test: /\.(jpe?g|png|gif|svg)$/i,
+          // lossLess gif compressor
+          gifsicle: {
+              optimizationLevel: 9
+          },
+          // lossy png compressor, remove for default lossLess
+          pngquant: ({
+              quality: '75'
+          }),
+          // lossy jpg compressor
+          plugins: [imageminMozjpeg({
+              quality: '75'
+          })],
+          destination: './webpack',
+      }),       
         new ESLintPlugin({
             cache: true,
             ignore: true,
@@ -203,6 +222,7 @@ module.exports = {
               useShortDoctype                : true
             },
             favicon: "./src/assets/images/favicon-32x32.png",
+            
             excludeChunks: ['test'],
         }),
         

components/wifi-manager/webapp/webpack/webpack.prod.js

@@ -11,8 +11,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
 const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const CompressionPlugin = require('compression-webpack-plugin');
-const ImageminPlugin = require('imagemin-webpack-plugin').default;
-const imageminMozjpeg = require('imagemin-mozjpeg');
+
 const fs = require('fs');
 const glob = require('glob');
 var WebpackOnBuildPlugin = require('on-build-webpack');
@@ -83,21 +82,7 @@ module.exports = merge(common, {
             threshold: 100,
             minRatio: 0.8,
         }),
-        new ImageminPlugin({
-            test: /\.(jpe?g|png|gif|svg)$/i,
-            // lossLess gif compressor
-            gifsicle: {
-                optimizationLevel: 9
-            },
-            // lossy png compressor, remove for default lossLess
-            pngquant: ({
-                quality: '75'
-            }),
-            // lossy jpg compressor
-            plugins: [imageminMozjpeg({
-                quality: '75'
-            })]
-        }), 
+
         // new FaviconsWebpackPlugin({
         //     // Your source logo
         //     logo: './src/assets/images/200px-ControllerAppIcon.png',
@@ -152,7 +137,7 @@ module.exports = merge(common, {
                     console.log('Error', err);
                 } else {
                     const regex = /^(.*\/)([^\/]*)$/
-                    const relativeRegex = /(\w+\/[^\/]*)$/
+                    const relativeRegex = /((\w+(?<!dist)\/){0,1}[^\/]*)$/
                     const makePathRegex = /([^\.].*)$/
                     let exportDefHead=
                     '/***********************************\n'+