Skip to content

Commit f15f4b2

Browse files
Merge pull request #18817 from MauricioFauth/js-upgrade
Update JavaScript dependencies
2 parents d2b967c + 3a9a4da commit f15f4b2

8 files changed

Lines changed: 245 additions & 260 deletions

File tree

.github/workflows/daily-snapshots.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
matrix:
2323
include:
2424
- { version: '5.2', branch: 'QA_5_2', php-version: '7.2', node-version: '12', python-version: '3.7' }
25-
- { version: '6.0', branch: 'master', php-version: '8.1', node-version: '14', python-version: '3.7' }
25+
- { version: '6.0', branch: 'master', php-version: '8.1', node-version: '16', python-version: '3.7' }
2626
steps:
2727
- name: Check out code
2828
uses: actions/checkout@v4

.github/workflows/frontend-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Set up Node
2929
uses: actions/setup-node@v3
3030
with:
31-
node-version: '14'
31+
node-version: '16'
3232
cache: 'yarn'
3333

3434
- name: Install modules
@@ -47,7 +47,7 @@ jobs:
4747
- name: Set up Node
4848
uses: actions/setup-node@v3
4949
with:
50-
node-version: '14'
50+
node-version: '16'
5151
cache: 'yarn'
5252

5353
- name: Install modules
@@ -66,7 +66,7 @@ jobs:
6666
- name: Set up Node
6767
uses: actions/setup-node@v3
6868
with:
69-
node-version: '14'
69+
node-version: '16'
7070
cache: 'yarn'
7171

7272
- name: Install modules

.github/workflows/other-tools.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: Set up Node
5555
uses: actions/setup-node@v3
5656
with:
57-
node-version: '14'
57+
node-version: '16'
5858
cache: 'yarn'
5959

6060
- name: Set up Python

.github/workflows/test-selenium.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
- name: Set up Node
107107
uses: actions/setup-node@v3
108108
with:
109-
node-version: '14'
109+
node-version: '16'
110110
cache: 'yarn'
111111

112112
- name: Install modules

.scrutinizer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ build:
2222
analysis:
2323
environment:
2424
php: 8.1
25-
node: 14
25+
node: 16
2626
dependencies:
2727
before:
2828
- composer config --unset repositories.0

doc/setup.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ In order to install from Git, you'll need a few supporting applications:
9090

9191
* `Git <https://git-scm.com/downloads>`_ to download the source, or you can download the most recent source directly from `Github <https://codeload.github.com/phpmyadmin/phpmyadmin/zip/QA_5_2>`_
9292
* `Composer <https://getcomposer.org/download/>`__
93-
* `Node.js <https://nodejs.org/en/download/>`_ (version 14 or higher)
93+
* `Node.js <https://nodejs.org/en/download/>`_ (version 16 or higher)
9494
* `Yarn <https://classic.yarnpkg.com/en/docs/install>`_
9595

9696
You can clone current phpMyAdmin source from

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"license": "GPL-2.0",
88
"private": true,
99
"engines": {
10-
"node": ">=14"
10+
"node": ">=16"
1111
},
1212
"type": "module",
1313
"dependencies": {
@@ -24,7 +24,7 @@
2424
"@types/jquery.validation": "^1.16.7",
2525
"@types/jqueryui": "^1.12.16",
2626
"@types/js-cookie": "^3.0.3",
27-
"@zxcvbn-ts/core": "^2.2.1",
27+
"@zxcvbn-ts/core": "^3.0.4",
2828
"autoprefixer": "^10.4.15",
2929
"babel-loader": "^9.1.2",
3030
"bootstrap": "5.3.2",
@@ -52,7 +52,7 @@
5252
"tablesorter": "^2.31.3",
5353
"tracekit": "0.4.6",
5454
"ts-loader": "^9.4.2",
55-
"typescript": "~5.1.6",
55+
"typescript": "~5.3.2",
5656
"u2f-api-polyfill": "0.4.4",
5757
"updated-jqplot": "1.0.9",
5858
"webpack": "^5.76.3",
@@ -61,18 +61,18 @@
6161
},
6262
"devDependencies": {
6363
"@types/jest": "^29.5.0",
64-
"@typescript-eslint/eslint-plugin": "^5.57.0",
65-
"@typescript-eslint/parser": "^5.57.0",
64+
"@typescript-eslint/eslint-plugin": "^6.13.1",
65+
"@typescript-eslint/parser": "^6.13.1",
6666
"babel-jest": "^29.5.0",
6767
"eslint": "^8.36.0",
6868
"eslint-plugin-compat": "^4.1.4",
6969
"eslint-plugin-no-jquery": "^2.7.0",
7070
"jest": "^29.5.0",
7171
"jest-environment-jsdom": "^29.5.0",
72-
"stylelint": "^15.5.0",
73-
"stylelint-config-recommended-scss": "^10.0.0",
74-
"stylelint-config-standard": "^33.0.0",
75-
"stylelint-scss": "^4.6.0"
72+
"stylelint": "^15.11.0",
73+
"stylelint-config-recommended-scss": "^13.1.0",
74+
"stylelint-config-standard": "^34.0.0",
75+
"stylelint-scss": "^5.3.1"
7676
},
7777
"scripts": {
7878
"postinstall": "yarn run build",

0 commit comments

Comments
 (0)