Changes for review change comment.

Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>

.scrutinizer.yml

@@ -25,4 +25,4 @@ build:
                         command: './vendor/bin/phpcs  --standard=PMAStandard ./ --report=checkstyle --report-file=cs-data --ignore=*/vendor/*,*/build/*'
                         analysis:
                             file: 'cs-data'                 # The reporter filename
-                            format: 'php-cs-checkstyle'     # The supported format by Scrutinizer
+                            format: 'php-cs-checkstyle'     # The supported format by Scrutinizer

config.sample.inc.php

@@ -26,10 +26,14 @@
 $cfg['environment'] = 'production';
 
 /**
- * Port number for running development sever of webpack while you
- * are in development environment
+ * Webppack host for running development server of webpack
  */
-$cfg['webpack_port'] = 3307;
+$cfg['webpack_host'] = 'http://localhost:3307';
+
+/**
+ * Additional string to allow in CSP headers in development for webpack files.
+ */
+$cfg['CSPAllow'] = 'http://localhost:3307 ws://localhost:3307';
 
 /**
  * Servers configuration

doc/config.rst

@@ -3409,10 +3409,10 @@ Developer
 
     Enable you to set the working environment for loading js files
 
-.. config:option:: $cfg['webpack_port']
+.. config:option:: $cfg['webpack_host']
 
-    :type: integer
-    :default: 3307
+    :type: string
+    :default: `'http://localhost:3307'`
 
     Enable you to start webpack development server for serving js files
     when woking in the development environment

js/ajax.js

@@ -646,9 +646,9 @@ var AJAX = {
              */
             var check = name.split('_');
             if (check[check.length - 1] === 'new.js') {
-                var script_src = '';
+                var script_src;
                 if (PMA_commonParams.get('environment') === 'development') {
-                    script_src += 'http://localhost:' + PMA_commonParams.get('webpack_port') + '/js/dist/';
+                    script_src = PMA_commonParams.get('webpack_host') + '/js/dist/';
                 } else if (PMA_commonParams.get('environment') === 'production') {
                     script_src = 'js/dist/';
                 }

libraries/classes/Header.php

@@ -236,7 +236,7 @@ public function getJsParams(): array
 
         $params = [
             'environment' => $GLOBALS['cfg']['environment'],
-            'webpack_port' => $GLOBALS['cfg']['webpack_port'],
+            'webpack_host' => $GLOBALS['cfg']['webpack_host'],
             'common_query' => Url::getCommonRaw(),
             'opendb_url' => Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabDatabase'],

libraries/classes/Scripts.php

@@ -59,10 +59,9 @@ private function _includeFiles(array $files)
                  * DOM so that both new and old files can be used simultaneously
                  * It checks whether the file contains new in its name or not
                  */
+                $src = "";
                 if ($GLOBALS['cfg']['environment'] === 'development') {
-                    $src = "http://localhost:" . $GLOBALS['cfg']['webpack_port'] . "/";
-                } else if ($GLOBALS['cfg']['environment'] === 'production'){
-                    $src = "";
+                    $src = $GLOBALS['cfg']['webpack_host'] . "/";
                 }
                 $result .= '<script data-cfasync="false" type="text/javascript" src="' . $src . 'js/dist/'
                     .  $value['filename'] . '?' . Header::getVersionParameter() . '"></script>' . "\n";

webpack.config.babel.js

@@ -31,9 +31,9 @@ export default [{
         db_search_new: './js/src/db_search.js',
     },
     output: {
-        filename: 'js/sql.js',
+        filename: 'db_search_new.js',
         path: path.resolve(__dirname, 'dist'),
-        publicPath: 'http://localhost:3007/dist'
+        publicPath: 'http://localhost:3307/js/dist'
     },
     module: module,
     // devtool: 'source-map',