Skip to content

Commit 0ca7a79

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #18300 from MauricioFauth/typescript
Convert JavaScript files to TypeScript
2 parents 4b1593b + 5630079 commit 0ca7a79

112 files changed

Lines changed: 641 additions & 463 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc.json‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{
22
"extends": [
33
"eslint:recommended",
4+
"plugin:@typescript-eslint/eslint-recommended",
5+
"plugin:@typescript-eslint/recommended",
46
"plugin:no-jquery/deprecated",
57
"plugin:compat/recommended"
68
],
7-
"plugins": ["no-jquery"],
9+
"parser": "@typescript-eslint/parser",
10+
"plugins": [ "@typescript-eslint", "no-jquery" ],
811
"parserOptions": {
912
"ecmaVersion": 6,
1013
"sourceType": "module"
@@ -46,16 +49,24 @@
4649
"no-trailing-spaces": "error",
4750
"no-underscore-dangle": "error",
4851
"no-unneeded-ternary": "error",
52+
"no-var": "off",
4953
"object-curly-spacing": ["error", "always"],
5054
"one-var": ["error", "never"],
5155
"padded-blocks": ["error", "never"],
56+
"prefer-const": "off",
57+
"prefer-rest-params": "off",
58+
"prefer-spread": "off",
5259
"quotes": ["error", "single"],
5360
"semi": "error",
5461
"space-before-blocks": "error",
5562
"space-before-function-paren": "error",
5663
"space-in-parens": "error",
5764
"space-infix-ops": "error",
5865
"spaced-comment": ["error", "always"],
59-
"wrap-iife": "error"
66+
"wrap-iife": "error",
67+
"@typescript-eslint/ban-ts-comment": "off",
68+
"@typescript-eslint/no-empty-function": "off",
69+
"@typescript-eslint/no-unused-vars": "off",
70+
"@typescript-eslint/no-this-alias": "off"
6071
}
6172
}

‎babel.config.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"presets": [
3+
[
4+
"@babel/preset-env",
5+
{
6+
"targets": {
7+
"node": "current"
8+
}
9+
}
10+
],
11+
"@babel/preset-typescript"
12+
]
13+
}

‎jest.config.cjs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
/* eslint-env node */
22

33
module.exports = {
4+
extensionsToTreatAsEsm: ['.ts'],
45
coverageDirectory: '<rootDir>/build/javascript/',
5-
collectCoverageFrom: ['<rootDir>/js/src/**/*.js'],
6+
collectCoverageFrom: ['<rootDir>/js/src/**/*.ts'],
67
projects: [
78
{
89
coveragePathIgnorePatterns: [
910
'<rootDir>/node_modules/',
1011
'<rootDir>/js/vendor/',
1112
],
1213
displayName: 'phpMyAdmin',
13-
testMatch: ['<rootDir>/test/javascript/**/*.js'],
14-
transform: {},
14+
testMatch: ['<rootDir>/test/javascript/**/*.ts'],
15+
transform: { '\\.[jt]sx?$': 'babel-jest' },
1516
moduleNameMapper: {
1617
'^phpmyadmin/(.*)$': '<rootDir>/js/src/$1',
1718
'^@vendor/(.*)$': '<rootDir>/js/vendor/$1',

js/src/chart.js renamed to js/src/chart.ts

File renamed without changes.

js/src/codemirror/addon/lint/sql-lint.js renamed to js/src/codemirror/addon/lint/sql-lint.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import $ from 'jquery';
2-
import { CommonParams } from '../../../modules/common.js';
2+
import { CommonParams } from '../../../modules/common.ts';
33

44
window.CodeMirror.sqlLint = function (text, updateLinting, options, cm) {
55
// Skipping check if text box is empty.

js/src/console.js renamed to js/src/console.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import $ from 'jquery';
2-
import { Console } from './modules/console.js';
2+
import { Console } from './modules/console.ts';
33

44
$(function () {
55
Console.initialize();

js/src/database/central_columns.js renamed to js/src/database/central_columns.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import $ from 'jquery';
2-
import { AJAX } from '../modules/ajax.js';
3-
import { CommonParams } from '../modules/common.js';
4-
import { ajaxShowMessage } from '../modules/ajax-message.js';
2+
import { AJAX } from '../modules/ajax.ts';
3+
import { CommonParams } from '../modules/common.ts';
4+
import { ajaxShowMessage } from '../modules/ajax-message.ts';
55

66
/**
77
* @fileoverview events handling from central columns page

js/src/database/events.js renamed to js/src/database/events.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import $ from 'jquery';
2-
import { AJAX } from '../modules/ajax.js';
3-
import { Functions } from '../modules/functions.js';
4-
import { Navigation } from '../modules/navigation.js';
5-
import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';
6-
import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.js';
2+
import { AJAX } from '../modules/ajax.ts';
3+
import { Functions } from '../modules/functions.ts';
4+
import { Navigation } from '../modules/navigation.ts';
5+
import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts';
6+
import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.ts';
77

88
AJAX.registerTeardown('database/events.js', function () {
99
$(document).off('click', 'a.ajax.add_anchor, a.ajax.edit_anchor');

js/src/database/multi_table_query.js renamed to js/src/database/multi_table_query.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import $ from 'jquery';
2-
import { AJAX } from '../modules/ajax.js';
3-
import { Functions } from '../modules/functions.js';
4-
import { CommonParams } from '../modules/common.js';
5-
import { ajaxShowMessage } from '../modules/ajax-message.js';
6-
import { escapeBacktick } from '../modules/functions/escape.js';
2+
import { AJAX } from '../modules/ajax.ts';
3+
import { Functions } from '../modules/functions.ts';
4+
import { CommonParams } from '../modules/common.ts';
5+
import { ajaxShowMessage } from '../modules/ajax-message.ts';
6+
import { escapeBacktick } from '../modules/functions/escape.ts';
77

88
/**
99
* @fileoverview function used in QBE for DB

js/src/database/operations.js renamed to js/src/database/operations.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import $ from 'jquery';
2-
import { AJAX } from '../modules/ajax.js';
3-
import { Functions } from '../modules/functions.js';
4-
import { Navigation } from '../modules/navigation.js';
5-
import { CommonParams } from '../modules/common.js';
6-
import { ajaxShowMessage } from '../modules/ajax-message.js';
7-
import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.js';
8-
import { escapeHtml } from '../modules/functions/escape.js';
9-
import refreshMainContent from '../modules/functions/refreshMainContent.js';
2+
import { AJAX } from '../modules/ajax.ts';
3+
import { Functions } from '../modules/functions.ts';
4+
import { Navigation } from '../modules/navigation.ts';
5+
import { CommonParams } from '../modules/common.ts';
6+
import { ajaxShowMessage } from '../modules/ajax-message.ts';
7+
import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.ts';
8+
import { escapeHtml } from '../modules/functions/escape.ts';
9+
import refreshMainContent from '../modules/functions/refreshMainContent.ts';
1010

1111
/**
1212
* @fileoverview function used in server privilege pages

0 commit comments

Comments
 (0)