diff --git a/js/src/codemirror/addon/lint/sql-lint.ts b/js/src/codemirror/addon/lint/sql-lint.ts
index 1cf9dc787998..bf7856df58a8 100644
--- a/js/src/codemirror/addon/lint/sql-lint.ts
+++ b/js/src/codemirror/addon/lint/sql-lint.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { CommonParams } from '../../../modules/common.js';
+import { CommonParams } from '../../../modules/common.ts';
 
 window.CodeMirror.sqlLint = function (text, updateLinting, options, cm) {
     // Skipping check if text box is empty.
diff --git a/js/src/console.ts b/js/src/console.ts
index 2e5b944d0c29..7842d84157ad 100644
--- a/js/src/console.ts
+++ b/js/src/console.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { Console } from './modules/console.js';
+import { Console } from './modules/console.ts';
 
 $(function () {
     Console.initialize();
diff --git a/js/src/database/central_columns.ts b/js/src/database/central_columns.ts
index 3cfe80d1cff3..c5b21d5dea1f 100644
--- a/js/src/database/central_columns.ts
+++ b/js/src/database/central_columns.ts
@@ -1,7 +1,7 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { CommonParams } from '../modules/common.js';
-import { ajaxShowMessage } from '../modules/ajax-message.js';
+import { AJAX } from '../modules/ajax.ts';
+import { CommonParams } from '../modules/common.ts';
+import { ajaxShowMessage } from '../modules/ajax-message.ts';
 
 /**
  * @fileoverview   events handling from central columns page
diff --git a/js/src/database/events.ts b/js/src/database/events.ts
index f0d865b63563..22e0155462bd 100644
--- a/js/src/database/events.ts
+++ b/js/src/database/events.ts
@@ -1,9 +1,9 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
-import { Navigation } from '../modules/navigation.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';
-import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
+import { Navigation } from '../modules/navigation.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts';
+import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.ts';
 
 AJAX.registerTeardown('database/events.js', function () {
     $(document).off('click', 'a.ajax.add_anchor, a.ajax.edit_anchor');
diff --git a/js/src/database/multi_table_query.ts b/js/src/database/multi_table_query.ts
index 89e44ade6541..c07a48feb1c2 100644
--- a/js/src/database/multi_table_query.ts
+++ b/js/src/database/multi_table_query.ts
@@ -1,9 +1,9 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
-import { CommonParams } from '../modules/common.js';
-import { ajaxShowMessage } from '../modules/ajax-message.js';
-import { escapeBacktick } from '../modules/functions/escape.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
+import { CommonParams } from '../modules/common.ts';
+import { ajaxShowMessage } from '../modules/ajax-message.ts';
+import { escapeBacktick } from '../modules/functions/escape.ts';
 
 /**
  * @fileoverview    function used in QBE for DB
diff --git a/js/src/database/operations.ts b/js/src/database/operations.ts
index 9cddaf26a263..103810b7cfe9 100644
--- a/js/src/database/operations.ts
+++ b/js/src/database/operations.ts
@@ -1,12 +1,12 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
-import { Navigation } from '../modules/navigation.js';
-import { CommonParams } from '../modules/common.js';
-import { ajaxShowMessage } from '../modules/ajax-message.js';
-import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.js';
-import { escapeHtml } from '../modules/functions/escape.js';
-import refreshMainContent from '../modules/functions/refreshMainContent.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
+import { Navigation } from '../modules/navigation.ts';
+import { CommonParams } from '../modules/common.ts';
+import { ajaxShowMessage } from '../modules/ajax-message.ts';
+import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.ts';
+import { escapeHtml } from '../modules/functions/escape.ts';
+import refreshMainContent from '../modules/functions/refreshMainContent.ts';
 
 /**
  * @fileoverview    function used in server privilege pages
diff --git a/js/src/database/qbe.ts b/js/src/database/qbe.ts
index 81d4856b4eee..ab6ccc28b33d 100644
--- a/js/src/database/qbe.ts
+++ b/js/src/database/qbe.ts
@@ -1,6 +1,6 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
 
 /**
  * @fileoverview    function used in QBE for DB
diff --git a/js/src/database/query_generator.ts b/js/src/database/query_generator.ts
index e861e4ce64b0..a7ac4415cd95 100644
--- a/js/src/database/query_generator.ts
+++ b/js/src/database/query_generator.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { escapeBacktick, escapeSingleQuote } from '../modules/functions/escape.js';
+import { escapeBacktick, escapeSingleQuote } from '../modules/functions/escape.ts';
 
 /**
  * @fileoverview    function used in QBE for DB
diff --git a/js/src/database/routines.ts b/js/src/database/routines.ts
index 2040242c878f..ef796cff3473 100644
--- a/js/src/database/routines.ts
+++ b/js/src/database/routines.ts
@@ -1,9 +1,9 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
-import { Navigation } from '../modules/navigation.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';
-import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
+import { Navigation } from '../modules/navigation.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts';
+import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.ts';
 
 AJAX.registerTeardown('database/routines.js', function () {
     $(document).off('click', 'a.ajax.add_anchor');
diff --git a/js/src/database/search.ts b/js/src/database/search.ts
index 122faff5a00e..8197f75f032e 100644
--- a/js/src/database/search.ts
+++ b/js/src/database/search.ts
@@ -1,10 +1,10 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
-import { CommonParams } from '../modules/common.js';
-import highlightSql from '../modules/sql-highlight.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';
-import getImageTag from '../modules/functions/getImageTag.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
+import { CommonParams } from '../modules/common.ts';
+import highlightSql from '../modules/sql-highlight.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts';
+import getImageTag from '../modules/functions/getImageTag.ts';
 
 /**
  * JavaScript functions used on Database Search page
diff --git a/js/src/database/structure.ts b/js/src/database/structure.ts
index 39e9d4e50a8c..639f9ec7d16f 100644
--- a/js/src/database/structure.ts
+++ b/js/src/database/structure.ts
@@ -1,12 +1,12 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
-import { Navigation } from '../modules/navigation.js';
-import { CommonParams } from '../modules/common.js';
-import tooltip from '../modules/tooltip.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';
-import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.js';
-import { escapeHtml } from '../modules/functions/escape.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
+import { Navigation } from '../modules/navigation.ts';
+import { CommonParams } from '../modules/common.ts';
+import tooltip from '../modules/tooltip.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts';
+import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.ts';
+import { escapeHtml } from '../modules/functions/escape.ts';
 
 /**
  * @fileoverview    functions used on the database structure page
diff --git a/js/src/database/tracking.ts b/js/src/database/tracking.ts
index f493742982a1..1a76f39deb29 100644
--- a/js/src/database/tracking.ts
+++ b/js/src/database/tracking.ts
@@ -1,8 +1,8 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { CommonParams } from '../modules/common.js';
-import { ajaxShowMessage } from '../modules/ajax-message.js';
-import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.js';
+import { AJAX } from '../modules/ajax.ts';
+import { CommonParams } from '../modules/common.ts';
+import { ajaxShowMessage } from '../modules/ajax-message.ts';
+import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.ts';
 
 /**
  * Unbind all event handlers before tearing down the page
diff --git a/js/src/database/triggers.ts b/js/src/database/triggers.ts
index 6402eda3748d..79ea5fde9b1a 100644
--- a/js/src/database/triggers.ts
+++ b/js/src/database/triggers.ts
@@ -1,9 +1,9 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
-import { Navigation } from '../modules/navigation.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';
-import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
+import { Navigation } from '../modules/navigation.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts';
+import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.ts';
 
 AJAX.registerTeardown('database/triggers.js', function () {
     $(document).off('click', 'a.ajax.add_anchor, a.ajax.edit_anchor');
diff --git a/js/src/designer/database.ts b/js/src/designer/database.ts
index 2ef7c43730ee..2025cec3998b 100644
--- a/js/src/designer/database.ts
+++ b/js/src/designer/database.ts
@@ -1,4 +1,4 @@
-import { ajaxShowMessage } from '../modules/ajax-message.js';
+import { ajaxShowMessage } from '../modules/ajax-message.ts';
 
 var designerTables = [
     {
diff --git a/js/src/designer/history.ts b/js/src/designer/history.ts
index 70b5ae08bd05..90d8e8484b4c 100644
--- a/js/src/designer/history.ts
+++ b/js/src/designer/history.ts
@@ -1,7 +1,7 @@
 import $ from 'jquery';
-import { Functions } from '../modules/functions.js';
-import getImageTag from '../modules/functions/getImageTag.js';
-import { DesignerConfig } from './config.js';
+import { Functions } from '../modules/functions.ts';
+import getImageTag from '../modules/functions/getImageTag.ts';
+import { DesignerConfig } from './config.ts';
 
 /**
  * @fileoverview    function used in this file builds history tab and generates query.
diff --git a/js/src/designer/init.ts b/js/src/designer/init.ts
index c838c94c4400..ecd324fcc4ec 100644
--- a/js/src/designer/init.ts
+++ b/js/src/designer/init.ts
@@ -1,10 +1,10 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { DesignerOfflineDB } from './database.js';
-import { DesignerHistory } from './history.js';
-import { DesignerMove } from './move.js';
-import { DesignerPage } from './page.js';
-import { DesignerConfig } from './config.js';
+import { AJAX } from '../modules/ajax.ts';
+import { DesignerOfflineDB } from './database.ts';
+import { DesignerHistory } from './history.ts';
+import { DesignerMove } from './move.ts';
+import { DesignerPage } from './page.ts';
+import { DesignerConfig } from './config.ts';
 
 /**
  * Initializes the data required to run Designer, then fires it up.
diff --git a/js/src/designer/move.ts b/js/src/designer/move.ts
index 98e8a547aba0..4cef29ba2b6b 100644
--- a/js/src/designer/move.ts
+++ b/js/src/designer/move.ts
@@ -1,13 +1,13 @@
 import $ from 'jquery';
-import { Functions } from '../modules/functions.js';
-import { CommonParams } from '../modules/common.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';
-import refreshMainContent from '../modules/functions/refreshMainContent.js';
-import { Navigation } from '../modules/navigation.js';
-import { DesignerObjects } from './objects.js';
-import { DesignerHistory } from './history.js';
-import { DesignerPage } from './page.js';
-import { DesignerConfig } from './config.js';
+import { Functions } from '../modules/functions.ts';
+import { CommonParams } from '../modules/common.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts';
+import refreshMainContent from '../modules/functions/refreshMainContent.ts';
+import { Navigation } from '../modules/navigation.ts';
+import { DesignerObjects } from './objects.ts';
+import { DesignerHistory } from './history.ts';
+import { DesignerPage } from './page.ts';
+import { DesignerConfig } from './config.ts';
 
 /* global themeImagePath */ // templates/javascript/variables.twig
 
diff --git a/js/src/designer/page.ts b/js/src/designer/page.ts
index dfc02504f705..106e66069363 100644
--- a/js/src/designer/page.ts
+++ b/js/src/designer/page.ts
@@ -1,10 +1,10 @@
 import $ from 'jquery';
-import { ajaxShowMessage } from '../modules/ajax-message.js';
-import { escapeHtml } from '../modules/functions/escape.js';
-import { DesignerConfig } from './config.js';
-import { DesignerOfflineDB } from './database.js';
-import { DesignerMove } from './move.js';
-import { DesignerObjects } from './objects.js';
+import { ajaxShowMessage } from '../modules/ajax-message.ts';
+import { escapeHtml } from '../modules/functions/escape.ts';
+import { DesignerConfig } from './config.ts';
+import { DesignerOfflineDB } from './database.ts';
+import { DesignerMove } from './move.ts';
+import { DesignerObjects } from './objects.ts';
 
 var DesignerPage = {};
 
diff --git a/js/src/drag_drop_import.ts b/js/src/drag_drop_import.ts
index 5cf8758c4d61..75cde540c53a 100644
--- a/js/src/drag_drop_import.ts
+++ b/js/src/drag_drop_import.ts
@@ -1,7 +1,7 @@
 import $ from 'jquery';
-import { AJAX } from './modules/ajax.js';
-import { CommonParams } from './modules/common.js';
-import { escapeHtml } from './modules/functions/escape.js';
+import { AJAX } from './modules/ajax.ts';
+import { CommonParams } from './modules/common.ts';
+import { escapeHtml } from './modules/functions/escape.ts';
 
 /* This script handles PMA Drag Drop Import, loaded only when configuration is enabled.*/
 
diff --git a/js/src/error_report.ts b/js/src/error_report.ts
index da38296d4763..243f26d8a031 100644
--- a/js/src/error_report.ts
+++ b/js/src/error_report.ts
@@ -1,8 +1,8 @@
 import $ from 'jquery';
-import { AJAX } from './modules/ajax.js';
-import { CommonParams } from './modules/common.js';
-import { ajaxShowMessage } from './modules/ajax-message.js';
-import getImageTag from './modules/functions/getImageTag.js';
+import { AJAX } from './modules/ajax.ts';
+import { CommonParams } from './modules/common.ts';
+import { ajaxShowMessage } from './modules/ajax-message.ts';
+import getImageTag from './modules/functions/getImageTag.ts';
 
 /**
  * general function, usually for data manipulation pages
diff --git a/js/src/export.ts b/js/src/export.ts
index fc85300b1cef..0602171cfb00 100644
--- a/js/src/export.ts
+++ b/js/src/export.ts
@@ -1,9 +1,9 @@
 import $ from 'jquery';
-import { AJAX } from './modules/ajax.js';
-import { Functions } from './modules/functions.js';
-import { CommonParams } from './modules/common.js';
-import highlightSql from './modules/sql-highlight.js';
-import { ajaxShowMessage } from './modules/ajax-message.js';
+import { AJAX } from './modules/ajax.ts';
+import { Functions } from './modules/functions.ts';
+import { CommonParams } from './modules/common.ts';
+import highlightSql from './modules/sql-highlight.ts';
+import { ajaxShowMessage } from './modules/ajax-message.ts';
 
 /**
  * Functions used in the export tab
diff --git a/js/src/export_output.ts b/js/src/export_output.ts
index f53210df8190..97904dcf8b0f 100644
--- a/js/src/export_output.ts
+++ b/js/src/export_output.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { AJAX } from './modules/ajax.js';
+import { AJAX } from './modules/ajax.ts';
 
 AJAX.registerOnload('export_output.js', function () {
     $(document).on('keydown', function (e) {
diff --git a/js/src/gis_data_editor.ts b/js/src/gis_data_editor.ts
index c9b9afff2fb1..736694e31fc4 100644
--- a/js/src/gis_data_editor.ts
+++ b/js/src/gis_data_editor.ts
@@ -1,7 +1,7 @@
 import $ from 'jquery';
-import { AJAX } from './modules/ajax.js';
-import { CommonParams } from './modules/common.js';
-import { ajaxShowMessage } from './modules/ajax-message.js';
+import { AJAX } from './modules/ajax.ts';
+import { CommonParams } from './modules/common.ts';
+import { ajaxShowMessage } from './modules/ajax-message.ts';
 
 /**
  * @fileoverview    functions used in GIS data editor
diff --git a/js/src/home.ts b/js/src/home.ts
index 23537b09254a..9673595fb2b2 100644
--- a/js/src/home.ts
+++ b/js/src/home.ts
@@ -1,6 +1,6 @@
-import { AJAX } from './modules/ajax.js';
-import { showGitVersion } from './modules/git-info.js';
-import { ThemesManager } from './modules/themes-manager.js';
+import { AJAX } from './modules/ajax.ts';
+import { showGitVersion } from './modules/git-info.ts';
+import { ThemesManager } from './modules/themes-manager.ts';
 
 AJAX.registerTeardown('home.js', () => {
     const themesModal = document.getElementById('themesModal');
diff --git a/js/src/import.ts b/js/src/import.ts
index d224e5ada4b8..a89da27e0f0e 100644
--- a/js/src/import.ts
+++ b/js/src/import.ts
@@ -1,9 +1,9 @@
 import $ from 'jquery';
-import { AJAX } from './modules/ajax.js';
-import { Functions } from './modules/functions.js';
-import { Navigation } from './modules/navigation.js';
-import { CommonParams } from './modules/common.js';
-import { ajaxShowMessage } from './modules/ajax-message.js';
+import { AJAX } from './modules/ajax.ts';
+import { Functions } from './modules/functions.ts';
+import { Navigation } from './modules/navigation.ts';
+import { CommonParams } from './modules/common.ts';
+import { ajaxShowMessage } from './modules/ajax-message.ts';
 
 /* global themeImagePath */ // templates/javascript/variables.twig
 
diff --git a/js/src/main.ts b/js/src/main.ts
index 72dbda6944ab..bd546f6404fd 100644
--- a/js/src/main.ts
+++ b/js/src/main.ts
@@ -1,14 +1,14 @@
 import $ from 'jquery';
-import { AJAX } from './modules/ajax.js';
-import { Functions } from './modules/functions.js';
-import { KeyHandlerEvents } from './modules/keyhandler.js';
-import { PageSettings } from './modules/page_settings.js';
-import { crossFramingProtection } from './modules/cross_framing_protection.js';
-import { Indexes } from './modules/indexes.js';
-import { Config } from './modules/config.js';
-import checkNumberOfFields from './modules/functions/checkNumberOfFields.js';
-import onloadNavigation from './modules/navigation/event-loader.js';
-import { onloadFunctions, teardownFunctions } from './modules/functions/event-loader.js';
+import { AJAX } from './modules/ajax.ts';
+import { Functions } from './modules/functions.ts';
+import { KeyHandlerEvents } from './modules/keyhandler.ts';
+import { PageSettings } from './modules/page_settings.ts';
+import { crossFramingProtection } from './modules/cross_framing_protection.ts';
+import { Indexes } from './modules/indexes.ts';
+import { Config } from './modules/config.ts';
+import checkNumberOfFields from './modules/functions/checkNumberOfFields.ts';
+import onloadNavigation from './modules/navigation/event-loader.ts';
+import { onloadFunctions, teardownFunctions } from './modules/functions/event-loader.ts';
 
 AJAX.registerOnload('main.js', () => AJAX.removeSubmitEvents());
 $(AJAX.loadEventHandler());
diff --git a/js/src/makegrid.ts b/js/src/makegrid.ts
index eac9548e3fed..d41d36d3ea1c 100644
--- a/js/src/makegrid.ts
+++ b/js/src/makegrid.ts
@@ -1,11 +1,11 @@
 import $ from 'jquery';
-import { AJAX } from './modules/ajax.js';
-import { Functions } from './modules/functions.js';
-import { CommonParams } from './modules/common.js';
-import tooltip from './modules/tooltip.js';
-import highlightSql from './modules/sql-highlight.js';
-import { ajaxShowMessage } from './modules/ajax-message.js';
-import { escapeHtml } from './modules/functions/escape.js';
+import { AJAX } from './modules/ajax.ts';
+import { Functions } from './modules/functions.ts';
+import { CommonParams } from './modules/common.ts';
+import tooltip from './modules/tooltip.ts';
+import highlightSql from './modules/sql-highlight.ts';
+import { ajaxShowMessage } from './modules/ajax-message.ts';
+import { escapeHtml } from './modules/functions/escape.ts';
 
 /* global Sql */
 /* global firstDayOfCalendar */ // templates/javascript/variables.twig
diff --git a/js/src/menu_resizer.ts b/js/src/menu_resizer.ts
index 6d1d2bd517d7..67096fbd9a14 100644
--- a/js/src/menu_resizer.ts
+++ b/js/src/menu_resizer.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import getImageTag from './modules/functions/getImageTag.js';
+import getImageTag from './modules/functions/getImageTag.ts';
 
 /**
  * Handles the resizing of a menu according to the available screen width
diff --git a/js/src/modules/ajax-message.ts b/js/src/modules/ajax-message.ts
index 9e5025ed8b8c..8a9176ce8ae6 100644
--- a/js/src/modules/ajax-message.ts
+++ b/js/src/modules/ajax-message.ts
@@ -1,6 +1,6 @@
 import $ from 'jquery';
-import tooltip from './tooltip.js';
-import highlightSql from './sql-highlight.js';
+import tooltip from './tooltip.ts';
+import highlightSql from './sql-highlight.ts';
 
 /**
  * Number of AJAX messages shown since page load.
diff --git a/js/src/modules/ajax.ts b/js/src/modules/ajax.ts
index fb0c9bc31951..9a19f900ec1e 100644
--- a/js/src/modules/ajax.ts
+++ b/js/src/modules/ajax.ts
@@ -1,14 +1,14 @@
 import $ from 'jquery';
-import { Navigation } from './navigation.js';
-import { CommonParams } from './common.js';
-import highlightSql from './sql-highlight.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from './ajax-message.js';
-import { escapeHtml } from './functions/escape.js';
-import getImageTag from './functions/getImageTag.js';
-import { ignorePhpErrors } from './functions/ignorePhpErrors.js';
-import handleRedirectAndReload from './functions/handleRedirectAndReload.js';
-import checkNumberOfFields from './functions/checkNumberOfFields.js';
-import mainMenuResizerCallback from './functions/mainMenuResizerCallback.js';
+import { Navigation } from './navigation.ts';
+import { CommonParams } from './common.ts';
+import highlightSql from './sql-highlight.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from './ajax-message.ts';
+import { escapeHtml } from './functions/escape.ts';
+import getImageTag from './functions/getImageTag.ts';
+import { ignorePhpErrors } from './functions/ignorePhpErrors.ts';
+import handleRedirectAndReload from './functions/handleRedirectAndReload.ts';
+import checkNumberOfFields from './functions/checkNumberOfFields.ts';
+import mainMenuResizerCallback from './functions/mainMenuResizerCallback.ts';
 
 /**
  * This object handles ajax requests for pages. It also
diff --git a/js/src/modules/config.ts b/js/src/modules/config.ts
index 50c3d4ecdc71..4ff1ee967af8 100644
--- a/js/src/modules/config.ts
+++ b/js/src/modules/config.ts
@@ -1,8 +1,8 @@
 import $ from 'jquery';
-import { CommonParams } from './common.js';
-import { ajaxShowMessage } from './ajax-message.js';
-import isStorageSupported from './functions/isStorageSupported.js';
-import formatDateTime from './functions/formatDateTime.js';
+import { CommonParams } from './common.ts';
+import { ajaxShowMessage } from './ajax-message.ts';
+import isStorageSupported from './functions/isStorageSupported.ts';
+import formatDateTime from './functions/formatDateTime.ts';
 
 /**
  * Functions used in configuration forms and on user preferences pages
diff --git a/js/src/modules/console.ts b/js/src/modules/console.ts
index 5d2d43be90cd..c099345ca176 100644
--- a/js/src/modules/console.ts
+++ b/js/src/modules/console.ts
@@ -1,12 +1,12 @@
 import $ from 'jquery';
 import CodeMirror from 'codemirror';
-import { AJAX } from './ajax.js';
-import { Functions } from './functions.js';
-import { CommonParams } from './common.js';
-import { Navigation } from './navigation.js';
-import { Config } from './console/config.js';
-import { getConfigValue } from './functions/config.js';
-import { escapeHtml } from './functions/escape.js';
+import { AJAX } from './ajax.ts';
+import { Functions } from './functions.ts';
+import { CommonParams } from './common.ts';
+import { Navigation } from './navigation.ts';
+import { Config } from './console/config.ts';
+import { getConfigValue } from './functions/config.ts';
+import { escapeHtml } from './functions/escape.ts';
 
 /**
  * Console object
diff --git a/js/src/modules/console/config.ts b/js/src/modules/console/config.ts
index bcee02acaa6a..0296b652a69f 100644
--- a/js/src/modules/console/config.ts
+++ b/js/src/modules/console/config.ts
@@ -1,4 +1,4 @@
-import { setConfigValue } from '../functions/config.js';
+import { setConfigValue } from '../functions/config.ts';
 
 /**
  * @link https://docs.phpmyadmin.net/en/latest/config.html#console-settings
diff --git a/js/src/modules/functions.ts b/js/src/modules/functions.ts
index 094a2b5c6499..4cbf3f021197 100644
--- a/js/src/modules/functions.ts
+++ b/js/src/modules/functions.ts
@@ -1,18 +1,18 @@
 import $ from 'jquery';
-import { AJAX } from './ajax.js';
-import { Navigation } from './navigation.js';
-import { CommonParams } from './common.js';
-import tooltip from './tooltip.js';
-import highlightSql from './sql-highlight.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from './ajax-message.js';
-import { escapeHtml } from './functions/escape.js';
-import getImageTag from './functions/getImageTag.js';
-import handleRedirectAndReload from './functions/handleRedirectAndReload.js';
-import refreshMainContent from './functions/refreshMainContent.js';
-import checkIndexType from './indexes/checkIndexType.js';
-import checkIndexName from './indexes/checkIndexName.js';
-import mainMenuResizerCallback from './functions/mainMenuResizerCallback.js';
-import isStorageSupported from './functions/isStorageSupported.js';
+import { AJAX } from './ajax.ts';
+import { Navigation } from './navigation.ts';
+import { CommonParams } from './common.ts';
+import tooltip from './tooltip.ts';
+import highlightSql from './sql-highlight.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from './ajax-message.ts';
+import { escapeHtml } from './functions/escape.ts';
+import getImageTag from './functions/getImageTag.ts';
+import handleRedirectAndReload from './functions/handleRedirectAndReload.ts';
+import refreshMainContent from './functions/refreshMainContent.ts';
+import checkIndexType from './indexes/checkIndexType.ts';
+import checkIndexName from './indexes/checkIndexName.ts';
+import mainMenuResizerCallback from './functions/mainMenuResizerCallback.ts';
+import isStorageSupported from './functions/isStorageSupported.ts';
 
 /* global DatabaseStructure */ // js/database/structure.js
 /* global firstDayOfCalendar, themeImagePath */ // templates/javascript/variables.twig
diff --git a/js/src/modules/functions/checkNumberOfFields.ts b/js/src/modules/functions/checkNumberOfFields.ts
index 9e6c7daf586e..1c58cc0e379d 100644
--- a/js/src/modules/functions/checkNumberOfFields.ts
+++ b/js/src/modules/functions/checkNumberOfFields.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { ajaxShowMessage } from '../ajax-message.js';
+import { ajaxShowMessage } from '../ajax-message.ts';
 
 /* global maxInputVars */ // templates/javascript/variables.twig
 
diff --git a/js/src/modules/functions/config.ts b/js/src/modules/functions/config.ts
index db2a1e05590b..b1c6917a8cc9 100644
--- a/js/src/modules/functions/config.ts
+++ b/js/src/modules/functions/config.ts
@@ -1,6 +1,6 @@
 import $ from 'jquery';
-import { ajaxShowMessage } from '../ajax-message.js';
-import { CommonParams } from '../common.js';
+import { ajaxShowMessage } from '../ajax-message.ts';
+import { CommonParams } from '../common.ts';
 
 /**
  * Sets a configuration value.
diff --git a/js/src/modules/functions/event-loader.ts b/js/src/modules/functions/event-loader.ts
index 865554b0a14b..3e124a8da443 100644
--- a/js/src/modules/functions/event-loader.ts
+++ b/js/src/modules/functions/event-loader.ts
@@ -1,6 +1,6 @@
 import $ from 'jquery';
-import { Functions } from '../functions.js';
-import handleCreateViewModal from './handleCreateViewModal.js';
+import { Functions } from '../functions.ts';
+import handleCreateViewModal from './handleCreateViewModal.ts';
 
 /**
  * @see https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener
diff --git a/js/src/modules/functions/getImageTag.ts b/js/src/modules/functions/getImageTag.ts
index 3244b6723688..3b07b9385133 100644
--- a/js/src/modules/functions/getImageTag.ts
+++ b/js/src/modules/functions/getImageTag.ts
@@ -1,4 +1,4 @@
-import { escapeHtml } from './escape.js';
+import { escapeHtml } from './escape.ts';
 
 /**
  * Returns an HTML IMG tag for a particular image from a theme,
diff --git a/js/src/modules/functions/getJsConfirmCommonParam.ts b/js/src/modules/functions/getJsConfirmCommonParam.ts
index 855a11aeced8..2d8155bc5327 100644
--- a/js/src/modules/functions/getJsConfirmCommonParam.ts
+++ b/js/src/modules/functions/getJsConfirmCommonParam.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { CommonParams } from '../common.js';
+import { CommonParams } from '../common.ts';
 
 /**
  * @param {HTMLElement} elem
diff --git a/js/src/modules/functions/handleCreateViewModal.ts b/js/src/modules/functions/handleCreateViewModal.ts
index aca328d7cf56..b9c5487780e6 100644
--- a/js/src/modules/functions/handleCreateViewModal.ts
+++ b/js/src/modules/functions/handleCreateViewModal.ts
@@ -1,9 +1,9 @@
 import $ from 'jquery';
-import { ajaxRemoveMessage, ajaxShowMessage } from '../ajax-message.js';
-import { CommonParams } from '../common.js';
-import { Functions } from '../functions.js';
-import { Navigation } from '../navigation.js';
-import getJsConfirmCommonParam from './getJsConfirmCommonParam.js';
+import { ajaxRemoveMessage, ajaxShowMessage } from '../ajax-message.ts';
+import { CommonParams } from '../common.ts';
+import { Functions } from '../functions.ts';
+import { Navigation } from '../navigation.ts';
+import getJsConfirmCommonParam from './getJsConfirmCommonParam.ts';
 
 /**
  * @param {JQuery<HTMLElement>} $this
diff --git a/js/src/modules/functions/handleRedirectAndReload.ts b/js/src/modules/functions/handleRedirectAndReload.ts
index 97a36512eea5..820a70e97ca0 100644
--- a/js/src/modules/functions/handleRedirectAndReload.ts
+++ b/js/src/modules/functions/handleRedirectAndReload.ts
@@ -1,4 +1,4 @@
-import { CommonParams } from '../common.js';
+import { CommonParams } from '../common.ts';
 
 /**
  * Handle redirect and reload flags sent as part of AJAX requests
diff --git a/js/src/modules/functions/isStorageSupported.ts b/js/src/modules/functions/isStorageSupported.ts
index e890c4f1ffac..c2f685eb3199 100644
--- a/js/src/modules/functions/isStorageSupported.ts
+++ b/js/src/modules/functions/isStorageSupported.ts
@@ -1,4 +1,4 @@
-import { ajaxShowMessage } from '../ajax-message.js';
+import { ajaxShowMessage } from '../ajax-message.ts';
 
 /**
  * checks whether browser supports web storage
diff --git a/js/src/modules/functions/refreshMainContent.ts b/js/src/modules/functions/refreshMainContent.ts
index 5b5a2f18ce79..67eaa9b68d7b 100644
--- a/js/src/modules/functions/refreshMainContent.ts
+++ b/js/src/modules/functions/refreshMainContent.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { CommonParams } from '../common.js';
+import { CommonParams } from '../common.ts';
 
 /**
  * Refreshes the main frame
diff --git a/js/src/modules/git-info.ts b/js/src/modules/git-info.ts
index 394237dd8160..f380430684d9 100644
--- a/js/src/modules/git-info.ts
+++ b/js/src/modules/git-info.ts
@@ -1,6 +1,6 @@
 import $ from 'jquery';
-import { CommonParams } from './common.js';
-import { escapeHtml } from './functions/escape.js';
+import { CommonParams } from './common.ts';
+import { escapeHtml } from './functions/escape.ts';
 
 const GitInfo = {
     /**
diff --git a/js/src/modules/indexes.ts b/js/src/modules/indexes.ts
index daa14509e82f..6933500bf984 100644
--- a/js/src/modules/indexes.ts
+++ b/js/src/modules/indexes.ts
@@ -1,14 +1,14 @@
 import $ from 'jquery';
-import { AJAX } from './ajax.js';
-import { Functions } from './functions.js';
-import { Navigation } from './navigation.js';
-import { CommonParams } from './common.js';
-import highlightSql from './sql-highlight.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from './ajax-message.js';
-import getJsConfirmCommonParam from './functions/getJsConfirmCommonParam.js';
-import refreshMainContent from './functions/refreshMainContent.js';
-import checkIndexType from './indexes/checkIndexType.js';
-import checkIndexName from './indexes/checkIndexName.js';
+import { AJAX } from './ajax.ts';
+import { Functions } from './functions.ts';
+import { Navigation } from './navigation.ts';
+import { CommonParams } from './common.ts';
+import highlightSql from './sql-highlight.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from './ajax-message.ts';
+import getJsConfirmCommonParam from './functions/getJsConfirmCommonParam.ts';
+import refreshMainContent from './functions/refreshMainContent.ts';
+import checkIndexType from './indexes/checkIndexType.ts';
+import checkIndexName from './indexes/checkIndexName.ts';
 
 /**
  * @fileoverview    function used for index manipulation pages
diff --git a/js/src/modules/navigation.ts b/js/src/modules/navigation.ts
index 9251c3991428..b56fcdea9ad2 100644
--- a/js/src/modules/navigation.ts
+++ b/js/src/modules/navigation.ts
@@ -1,10 +1,10 @@
 import $ from 'jquery';
-import { CommonParams } from './common.js';
-import { Config } from './config.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from './ajax-message.js';
-import { getConfigValue, setConfigValue } from './functions/config.js';
-import handleRedirectAndReload from './functions/handleRedirectAndReload.js';
-import isStorageSupported from './functions/isStorageSupported.js';
+import { CommonParams } from './common.ts';
+import { Config } from './config.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from './ajax-message.ts';
+import { getConfigValue, setConfigValue } from './functions/config.ts';
+import handleRedirectAndReload from './functions/handleRedirectAndReload.ts';
+import isStorageSupported from './functions/isStorageSupported.ts';
 
 /**
  * function used in or for navigation panel
diff --git a/js/src/modules/navigation/event-loader.ts b/js/src/modules/navigation/event-loader.ts
index 7534c508dd04..e31cb4049a6e 100644
--- a/js/src/modules/navigation/event-loader.ts
+++ b/js/src/modules/navigation/event-loader.ts
@@ -1,10 +1,10 @@
 import $ from 'jquery';
-import { CommonParams } from '../common.js';
-import { Navigation } from '../navigation.js';
-import handleCreateViewModal from '../functions/handleCreateViewModal.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from '../ajax-message.js';
-import isStorageSupported from '../functions/isStorageSupported.js';
-import tooltip from '../tooltip.js';
+import { CommonParams } from '../common.ts';
+import { Navigation } from '../navigation.ts';
+import handleCreateViewModal from '../functions/handleCreateViewModal.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from '../ajax-message.ts';
+import isStorageSupported from '../functions/isStorageSupported.ts';
+import tooltip from '../tooltip.ts';
 
 /**
  * @return {function}
diff --git a/js/src/modules/themes-manager.ts b/js/src/modules/themes-manager.ts
index c35d35a7603d..3500b36acee6 100644
--- a/js/src/modules/themes-manager.ts
+++ b/js/src/modules/themes-manager.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { CommonParams } from './common.js';
+import { CommonParams } from './common.ts';
 
 /**
  * @see https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener
diff --git a/js/src/multi_column_sort.ts b/js/src/multi_column_sort.ts
index 542da4411a53..aa20a51daa58 100644
--- a/js/src/multi_column_sort.ts
+++ b/js/src/multi_column_sort.ts
@@ -1,7 +1,7 @@
 import $ from 'jquery';
-import { AJAX } from './modules/ajax.js';
-import { CommonParams } from './modules/common.js';
-import { ajaxShowMessage } from './modules/ajax-message.js';
+import { AJAX } from './modules/ajax.ts';
+import { CommonParams } from './modules/common.ts';
+import { ajaxShowMessage } from './modules/ajax-message.ts';
 
 /**
  * @fileoverview    Implements the shiftkey + click remove column
diff --git a/js/src/normalization.ts b/js/src/normalization.ts
index e7fccc6423c3..d8cf89d905c6 100644
--- a/js/src/normalization.ts
+++ b/js/src/normalization.ts
@@ -1,9 +1,9 @@
 import $ from 'jquery';
-import { AJAX } from './modules/ajax.js';
-import { Functions } from './modules/functions.js';
-import { CommonParams } from './modules/common.js';
-import { ajaxShowMessage } from './modules/ajax-message.js';
-import { escapeHtml, escapeJsString } from './modules/functions/escape.js';
+import { AJAX } from './modules/ajax.ts';
+import { Functions } from './modules/functions.ts';
+import { CommonParams } from './modules/common.ts';
+import { ajaxShowMessage } from './modules/ajax-message.ts';
+import { escapeHtml, escapeJsString } from './modules/functions/escape.ts';
 
 /**
  * @fileoverview   events handling from normalization page
diff --git a/js/src/replication.ts b/js/src/replication.ts
index d8aa59356003..aa535708096f 100644
--- a/js/src/replication.ts
+++ b/js/src/replication.ts
@@ -1,8 +1,8 @@
 import $ from 'jquery';
-import { AJAX } from './modules/ajax.js';
-import { Functions } from './modules/functions.js';
-import { ajaxShowMessage } from './modules/ajax-message.js';
-import getJsConfirmCommonParam from './modules/functions/getJsConfirmCommonParam.js';
+import { AJAX } from './modules/ajax.ts';
+import { Functions } from './modules/functions.ts';
+import { ajaxShowMessage } from './modules/ajax-message.ts';
+import getJsConfirmCommonParam from './modules/functions/getJsConfirmCommonParam.ts';
 
 /**
  * @fileoverview    Javascript functions used in server replication page
diff --git a/js/src/server/databases.ts b/js/src/server/databases.ts
index 2bd11c718e9c..f643c20bed3f 100644
--- a/js/src/server/databases.ts
+++ b/js/src/server/databases.ts
@@ -1,12 +1,12 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
-import { Navigation } from '../modules/navigation.js';
-import { CommonParams } from '../modules/common.js';
-import { ajaxShowMessage } from '../modules/ajax-message.js';
-import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.js';
-import { escapeHtml } from '../modules/functions/escape.js';
-import refreshMainContent from '../modules/functions/refreshMainContent.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
+import { Navigation } from '../modules/navigation.ts';
+import { CommonParams } from '../modules/common.ts';
+import { ajaxShowMessage } from '../modules/ajax-message.ts';
+import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.ts';
+import { escapeHtml } from '../modules/functions/escape.ts';
+import refreshMainContent from '../modules/functions/refreshMainContent.ts';
 
 /**
  * @see https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener
diff --git a/js/src/server/plugins.ts b/js/src/server/plugins.ts
index 5656104095ef..8e0e4d006764 100644
--- a/js/src/server/plugins.ts
+++ b/js/src/server/plugins.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
+import { AJAX } from '../modules/ajax.ts';
 
 /**
  * Make columns sortable, but only for tables with more than 1 data row.
diff --git a/js/src/server/privileges.ts b/js/src/server/privileges.ts
index 29cddd1d0a2f..c96dcc840099 100644
--- a/js/src/server/privileges.ts
+++ b/js/src/server/privileges.ts
@@ -1,10 +1,10 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
-import { CommonParams } from '../modules/common.js';
-import { Navigation } from '../modules/navigation.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';
-import getImageTag from '../modules/functions/getImageTag.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
+import { CommonParams } from '../modules/common.ts';
+import { Navigation } from '../modules/navigation.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts';
+import getImageTag from '../modules/functions/getImageTag.ts';
 
 /**
  * Export privileges modal handler
diff --git a/js/src/server/status/monitor.ts b/js/src/server/status/monitor.ts
index d3233d407aa5..5ef807542a74 100644
--- a/js/src/server/status/monitor.ts
+++ b/js/src/server/status/monitor.ts
@@ -1,12 +1,12 @@
 import $ from 'jquery';
-import { AJAX } from '../../modules/ajax.js';
-import { Functions } from '../../modules/functions.js';
-import { CommonParams } from '../../modules/common.js';
-import tooltip from '../../modules/tooltip.js';
-import createProfilingChart from '../../modules/functions/createProfilingChart.js';
-import { escapeHtml } from '../../modules/functions/escape.js';
-import getImageTag from '../../modules/functions/getImageTag.js';
-import isStorageSupported from '../../modules/functions/isStorageSupported.js';
+import { AJAX } from '../../modules/ajax.ts';
+import { Functions } from '../../modules/functions.ts';
+import { CommonParams } from '../../modules/common.ts';
+import tooltip from '../../modules/tooltip.ts';
+import createProfilingChart from '../../modules/functions/createProfilingChart.ts';
+import { escapeHtml } from '../../modules/functions/escape.ts';
+import getImageTag from '../../modules/functions/getImageTag.ts';
+import isStorageSupported from '../../modules/functions/isStorageSupported.ts';
 
 /**
  * @fileoverview    Javascript functions used in server status monitor page
diff --git a/js/src/server/status/processes.ts b/js/src/server/status/processes.ts
index 75189423333b..1b8600d6df54 100644
--- a/js/src/server/status/processes.ts
+++ b/js/src/server/status/processes.ts
@@ -1,10 +1,10 @@
 import $ from 'jquery';
-import { AJAX } from '../../modules/ajax.js';
-import { CommonParams } from '../../modules/common.js';
-import highlightSql from '../../modules/sql-highlight.js';
-import { ajaxShowMessage } from '../../modules/ajax-message.js';
-import { escapeHtml } from '../../modules/functions/escape.js';
-import getImageTag from '../../modules/functions/getImageTag.js';
+import { AJAX } from '../../modules/ajax.ts';
+import { CommonParams } from '../../modules/common.ts';
+import highlightSql from '../../modules/sql-highlight.ts';
+import { ajaxShowMessage } from '../../modules/ajax-message.ts';
+import { escapeHtml } from '../../modules/functions/escape.ts';
+import getImageTag from '../../modules/functions/getImageTag.ts';
 
 /**
  * Server Status Processes
diff --git a/js/src/server/status/queries.ts b/js/src/server/status/queries.ts
index 21a89e5c8917..acd83a4bdedf 100644
--- a/js/src/server/status/queries.ts
+++ b/js/src/server/status/queries.ts
@@ -1,6 +1,6 @@
 import $ from 'jquery';
-import { AJAX } from '../../modules/ajax.js';
-import createProfilingChart from '../../modules/functions/createProfilingChart.js';
+import { AJAX } from '../../modules/ajax.ts';
+import createProfilingChart from '../../modules/functions/createProfilingChart.ts';
 
 /**
  * @fileoverview    Javascript functions used in server status query page
diff --git a/js/src/server/status/variables.ts b/js/src/server/status/variables.ts
index be9c80ede5bc..76c71c9c7f91 100644
--- a/js/src/server/status/variables.ts
+++ b/js/src/server/status/variables.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { AJAX } from '../../modules/ajax.js';
+import { AJAX } from '../../modules/ajax.ts';
 
 /**
  *
diff --git a/js/src/server/user_groups.ts b/js/src/server/user_groups.ts
index 5eb55347f187..987b20f43f90 100644
--- a/js/src/server/user_groups.ts
+++ b/js/src/server/user_groups.ts
@@ -1,6 +1,6 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { escapeHtml } from '../modules/functions/escape.js';
+import { AJAX } from '../modules/ajax.ts';
+import { escapeHtml } from '../modules/functions/escape.ts';
 
 /**
  * @fileoverview    Javascript functions used in server user groups page
diff --git a/js/src/server/variables.ts b/js/src/server/variables.ts
index 70a316ec08d4..6ade5463f46f 100644
--- a/js/src/server/variables.ts
+++ b/js/src/server/variables.ts
@@ -1,7 +1,7 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { CommonParams } from '../modules/common.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';
+import { AJAX } from '../modules/ajax.ts';
+import { CommonParams } from '../modules/common.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts';
 
 /**
  * @fileoverview    Javascript functions used in server variables page
diff --git a/js/src/setup/scripts.ts b/js/src/setup/scripts.ts
index c289bd102567..c855548c7b48 100644
--- a/js/src/setup/scripts.ts
+++ b/js/src/setup/scripts.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { Config } from '../modules/config.js';
+import { Config } from '../modules/config.ts';
 
 /**
  * Functions used in Setup configuration forms
diff --git a/js/src/shortcuts_handler.ts b/js/src/shortcuts_handler.ts
index ef60fddef067..1b95f9bdfbe0 100644
--- a/js/src/shortcuts_handler.ts
+++ b/js/src/shortcuts_handler.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { CommonParams } from './modules/common.js';
+import { CommonParams } from './modules/common.ts';
 
 /**
  * @fileoverview    Handle shortcuts in various pages
diff --git a/js/src/sql.ts b/js/src/sql.ts
index 3d87918d2d96..0234f63d05ed 100644
--- a/js/src/sql.ts
+++ b/js/src/sql.ts
@@ -1,14 +1,14 @@
 import $ from 'jquery';
-import { AJAX } from './modules/ajax.js';
-import { Functions } from './modules/functions.js';
-import { Navigation } from './modules/navigation.js';
-import { CommonParams } from './modules/common.js';
-import highlightSql from './modules/sql-highlight.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from './modules/ajax-message.js';
-import createProfilingChart from './modules/functions/createProfilingChart.js';
-import { escapeHtml } from './modules/functions/escape.js';
-import refreshMainContent from './modules/functions/refreshMainContent.js';
-import isStorageSupported from './modules/functions/isStorageSupported.js';
+import { AJAX } from './modules/ajax.ts';
+import { Functions } from './modules/functions.ts';
+import { Navigation } from './modules/navigation.ts';
+import { CommonParams } from './modules/common.ts';
+import highlightSql from './modules/sql-highlight.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from './modules/ajax-message.ts';
+import createProfilingChart from './modules/functions/createProfilingChart.ts';
+import { escapeHtml } from './modules/functions/escape.ts';
+import refreshMainContent from './modules/functions/refreshMainContent.ts';
+import isStorageSupported from './modules/functions/isStorageSupported.ts';
 
 /**
  * @fileoverview    functions used wherever an sql query form is used
diff --git a/js/src/table/change.ts b/js/src/table/change.ts
index bb11391932ca..692f4bc4a13e 100644
--- a/js/src/table/change.ts
+++ b/js/src/table/change.ts
@@ -1,6 +1,6 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
 
 /**
  * @fileoverview    function used in table data manipulation pages
diff --git a/js/src/table/chart.ts b/js/src/table/chart.ts
index 681a81f58dc6..a01335a1eaaa 100644
--- a/js/src/table/chart.ts
+++ b/js/src/table/chart.ts
@@ -1,8 +1,8 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';
-import { escapeHtml } from '../modules/functions/escape.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts';
+import { escapeHtml } from '../modules/functions/escape.ts';
 
 /* global ColumnType, DataTable, JQPlotChartFactory */ // js/chart.js
 
diff --git a/js/src/table/find_replace.ts b/js/src/table/find_replace.ts
index 71050a9b3aae..190108d89fb8 100644
--- a/js/src/table/find_replace.ts
+++ b/js/src/table/find_replace.ts
@@ -1,7 +1,7 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts';
 
 /**
  * Unbind all event handlers before tearing down a page
diff --git a/js/src/table/gis_visualization.ts b/js/src/table/gis_visualization.ts
index 9f70038f471b..ce456f511f64 100644
--- a/js/src/table/gis_visualization.ts
+++ b/js/src/table/gis_visualization.ts
@@ -1,6 +1,6 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { escapeHtml } from '../modules/functions/escape.js';
+import { AJAX } from '../modules/ajax.ts';
+import { escapeHtml } from '../modules/functions/escape.ts';
 
 /**
  * @fileoverview    functions used for visualizing GIS data
diff --git a/js/src/table/operations.ts b/js/src/table/operations.ts
index 2d77b402a984..3833f72c98a5 100644
--- a/js/src/table/operations.ts
+++ b/js/src/table/operations.ts
@@ -1,13 +1,13 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
-import { Navigation } from '../modules/navigation.js';
-import { CommonParams } from '../modules/common.js';
-import highlightSql from '../modules/sql-highlight.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';
-import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.js';
-import { escapeHtml } from '../modules/functions/escape.js';
-import refreshMainContent from '../modules/functions/refreshMainContent.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
+import { Navigation } from '../modules/navigation.ts';
+import { CommonParams } from '../modules/common.ts';
+import highlightSql from '../modules/sql-highlight.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts';
+import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.ts';
+import { escapeHtml } from '../modules/functions/escape.ts';
+import refreshMainContent from '../modules/functions/refreshMainContent.ts';
 
 /**
  * Unbind all event handlers before tearing down a page
diff --git a/js/src/table/relation.ts b/js/src/table/relation.ts
index ac37bc95288f..e69c471b4774 100644
--- a/js/src/table/relation.ts
+++ b/js/src/table/relation.ts
@@ -1,10 +1,10 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { CommonParams } from '../modules/common.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';
-import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.js';
-import { escapeHtml } from '../modules/functions/escape.js';
-import refreshMainContent from '../modules/functions/refreshMainContent.js';
+import { AJAX } from '../modules/ajax.ts';
+import { CommonParams } from '../modules/common.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts';
+import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.ts';
+import { escapeHtml } from '../modules/functions/escape.ts';
+import refreshMainContent from '../modules/functions/refreshMainContent.ts';
 
 /**
  * for table relation
diff --git a/js/src/table/select.ts b/js/src/table/select.ts
index 86d8ce5fc2c0..befe5946dcc3 100644
--- a/js/src/table/select.ts
+++ b/js/src/table/select.ts
@@ -1,9 +1,9 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
-import { CommonParams } from '../modules/common.js';
-import highlightSql from '../modules/sql-highlight.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
+import { CommonParams } from '../modules/common.ts';
+import highlightSql from '../modules/sql-highlight.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts';
 
 /**
  * @fileoverview JavaScript functions used on /table/search
diff --git a/js/src/table/structure.ts b/js/src/table/structure.ts
index 5f64932a2190..928cfdf6c106 100644
--- a/js/src/table/structure.ts
+++ b/js/src/table/structure.ts
@@ -1,14 +1,14 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
-import { Navigation } from '../modules/navigation.js';
-import { CommonParams } from '../modules/common.js';
-import highlightSql from '../modules/sql-highlight.js';
-import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';
-import { Indexes } from '../modules/indexes.js';
-import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.js';
-import { escapeHtml } from '../modules/functions/escape.js';
-import refreshMainContent from '../modules/functions/refreshMainContent.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
+import { Navigation } from '../modules/navigation.ts';
+import { CommonParams } from '../modules/common.ts';
+import highlightSql from '../modules/sql-highlight.ts';
+import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts';
+import { Indexes } from '../modules/indexes.ts';
+import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.ts';
+import { escapeHtml } from '../modules/functions/escape.ts';
+import refreshMainContent from '../modules/functions/refreshMainContent.ts';
 
 /**
  * @fileoverview    functions used on the table structure page
diff --git a/js/src/table/tracking.ts b/js/src/table/tracking.ts
index 5b71e15fafda..a8e6ee8b33fe 100644
--- a/js/src/table/tracking.ts
+++ b/js/src/table/tracking.ts
@@ -1,8 +1,8 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { CommonParams } from '../modules/common.js';
-import { ajaxShowMessage } from '../modules/ajax-message.js';
-import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.js';
+import { AJAX } from '../modules/ajax.ts';
+import { CommonParams } from '../modules/common.ts';
+import { ajaxShowMessage } from '../modules/ajax-message.ts';
+import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.ts';
 
 /**
  * Unbind all event handlers before tearing down the page
diff --git a/js/src/table/zoom_plot_jqplot.ts b/js/src/table/zoom_plot_jqplot.ts
index b9314ff26b1f..588814dd2f6f 100644
--- a/js/src/table/zoom_plot_jqplot.ts
+++ b/js/src/table/zoom_plot_jqplot.ts
@@ -1,9 +1,9 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
-import { CommonParams } from '../modules/common.js';
-import highlightSql from '../modules/sql-highlight.js';
-import { ajaxShowMessage } from '../modules/ajax-message.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
+import { CommonParams } from '../modules/common.ts';
+import highlightSql from '../modules/sql-highlight.ts';
+import { ajaxShowMessage } from '../modules/ajax-message.ts';
 
 // TODO: change the axis
 /**
diff --git a/js/src/transformations/image_upload.ts b/js/src/transformations/image_upload.ts
index 912a139c58a2..db002dd63a6d 100644
--- a/js/src/transformations/image_upload.ts
+++ b/js/src/transformations/image_upload.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
+import { AJAX } from '../modules/ajax.ts';
 
 /**
  * Image upload transformations plugin js
diff --git a/js/src/transformations/json.ts b/js/src/transformations/json.ts
index 9ab9d70754de..e38c1c7fd6f7 100644
--- a/js/src/transformations/json.ts
+++ b/js/src/transformations/json.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
+import { AJAX } from '../modules/ajax.ts';
 
 /**
  * JSON syntax highlighting transformation plugin
diff --git a/js/src/transformations/json_editor.ts b/js/src/transformations/json_editor.ts
index 222b47bcf43c..c83f12c68c87 100644
--- a/js/src/transformations/json_editor.ts
+++ b/js/src/transformations/json_editor.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
+import { AJAX } from '../modules/ajax.ts';
 
 /**
  * JSON syntax highlighting transformation plugin
diff --git a/js/src/transformations/sql_editor.ts b/js/src/transformations/sql_editor.ts
index 22411768f0b3..adf2e1cc6b60 100644
--- a/js/src/transformations/sql_editor.ts
+++ b/js/src/transformations/sql_editor.ts
@@ -1,6 +1,6 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
-import { Functions } from '../modules/functions.js';
+import { AJAX } from '../modules/ajax.ts';
+import { Functions } from '../modules/functions.ts';
 
 /**
  * SQL syntax highlighting transformation plugin js
diff --git a/js/src/transformations/xml.ts b/js/src/transformations/xml.ts
index b3fa88c6167f..e7652656b4df 100644
--- a/js/src/transformations/xml.ts
+++ b/js/src/transformations/xml.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
+import { AJAX } from '../modules/ajax.ts';
 
 /**
  * XML syntax highlighting transformation plugin
diff --git a/js/src/transformations/xml_editor.ts b/js/src/transformations/xml_editor.ts
index ff05320b11e6..468597b6fb61 100644
--- a/js/src/transformations/xml_editor.ts
+++ b/js/src/transformations/xml_editor.ts
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import { AJAX } from '../modules/ajax.js';
+import { AJAX } from '../modules/ajax.ts';
 
 /**
  * XML editor plugin
diff --git a/js/src/u2f.ts b/js/src/u2f.ts
index 34ec4efb64ac..059745383794 100644
--- a/js/src/u2f.ts
+++ b/js/src/u2f.ts
@@ -1,6 +1,6 @@
 import $ from 'jquery';
-import { AJAX } from './modules/ajax.js';
-import { ajaxShowMessage } from './modules/ajax-message.js';
+import { AJAX } from './modules/ajax.ts';
+import { ajaxShowMessage } from './modules/ajax-message.ts';
 
 AJAX.registerOnload('u2f.js', function () {
     var $inputReg = $('#u2f_registration_response');
diff --git a/js/src/webauthn.ts b/js/src/webauthn.ts
index b328ed664020..db1af46de61c 100644
--- a/js/src/webauthn.ts
+++ b/js/src/webauthn.ts
@@ -1,6 +1,6 @@
 import $ from 'jquery';
-import { AJAX } from './modules/ajax.js';
-import { ajaxShowMessage } from './modules/ajax-message.js';
+import { AJAX } from './modules/ajax.ts';
+import { ajaxShowMessage } from './modules/ajax-message.ts';
 
 /**
  * @param {ArrayBuffer} buffer
diff --git a/tsconfig.json b/tsconfig.json
index 663e9e115851..67dc551bde80 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,13 +1,14 @@
 {
     "compilerOptions": {
-        "target": "es6",
-        "module": "es6",
+        "target": "esnext",
+        "moduleResolution": "bundler",
         "allowJs": true,
         "declaration": true,
         "declarationMap": true,
         "checkJs": true,
         "outDir": "./build/js",
         "allowSyntheticDefaultImports": true,
+        "allowImportingTsExtensions": true,
         "strict": false,
         "isolatedModules": true
     },