Merge pull request #17456 from mauriciofauth/js-module-console

Extract `console.js` objects into `console` module

.eslintrc.json

@@ -5,6 +5,10 @@
         "plugin:compat/recommended"
     ],
     "plugins": ["no-jquery"],
+    "parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "module"
+    },
     "env": {
         "browser": true,
         "es6": true,

js/src/shortcuts_handler.js

@@ -6,8 +6,6 @@
  * @requires    jQueryUI
  */
 
-/* global Console */ // js/console.js
-
 /**
  * Register key events on load
  */
@@ -54,12 +52,12 @@ $(function () {
             return;
         }
         if (e.ctrlKey && e.altKey && e.keyCode === keyC) {
-            Console.toggle();
+            window.Console.toggle();
         }
 
         if (e.ctrlKey && e.keyCode === keyK) {
             e.preventDefault();
-            Console.toggle();
+            window.Console.toggle();
         }
 
         if (e.target.nodeName === 'INPUT' || e.target.nodeName === 'TEXTAREA' || e.target.nodeName === 'SELECT') {
@@ -72,7 +70,7 @@ $(function () {
             databaseOp = true;
         } else if (e.keyCode === keyK) {
             e.preventDefault();
-            Console.toggle();
+            window.Console.toggle();
         } else if (e.keyCode === keyS) {
             if (databaseOp === true) {
                 isTable = CommonParams.get('table');

libraries/classes/Footer.php

@@ -277,7 +277,7 @@ class Footer
                     $url = $this->getSelfUrl();
                 }
 
-                $this->scripts->addCode('window.ConsoleDebug.debugSqlInfo = ' . $this->getDebugMessage() . ';');
+                $this->scripts->addCode('window.Console.debugSqlInfo = ' . $this->getDebugMessage() . ';');
                 $errorMessages = $this->getErrorMessages();
                 $scripts = $this->scripts->getDisplay();
 

webpack.config.js

@@ -95,6 +95,10 @@ module.exports = [
             path: path.resolve(__dirname, 'js/dist'),
             iife: false,
         },
+        externals: {
+            jquery: 'jQuery',
+            codemirror: 'CodeMirror',
+        },
         module: {
             rules: [
                 {