Skip to content

Commit 3d442ae

Browse files
committed
Avoid unnecesary use of legacy eslint config style
Makes eslint v10 upgrade easier.
1 parent cc37eef commit 3d442ae

6 files changed

Lines changed: 21 additions & 19 deletions

File tree

.github/dependabot.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ updates:
2525
jasmine:
2626
patterns: ["jasmine*", "@types/jasmine*"]
2727
webpack:
28-
patterns: ["webpack*", "@types/webpack*", "*-loader", "*-webpack-plugin", "*mini-css-extract-plugin", "@babel/*"]
28+
patterns: ["webpack*", "*-loader", "*-webpack-plugin", "*mini-css-extract-plugin", "@babel/*"]
2929
exclude-patterns: ["karma-*-loader"]
30+
eslint:
31+
patterns: [ "eslint*", "@eslint/*", "@types/eslint*" ]
3032
types:
3133
patterns: ["@types/*"]
3234
- package-ecosystem: bundler

server/src/main/webapp/WEB-INF/rails/app/assets/javascripts/vsm_renderer.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,8 @@ Graph_Renderer = function (container) {
276276
}
277277

278278
function renderScmEntity(node) {
279-
var gui = '', node_name = '';
279+
var gui = '';
280+
var node_name;
280281
var modification = firstModification(node);
281282

282283
if (modification) {
@@ -502,9 +503,7 @@ Graph_Renderer = function (container) {
502503
}
503504

504505
function renderPipelineInstance(node_id, instance, node) {
505-
var gui = '';
506-
var stagesCount = 0;
507-
gui += '<li class="instance">';
506+
var gui = '<li class="instance">';
508507
if (instance.label != '') {
509508
if (isCurrent) {
510509
gui += `<h4 title="${_.escape(instance.label)}"><span class="pipeline_run_label">Instance: ${_.escape(instance.label)}</span></h4>`;
@@ -517,7 +516,7 @@ Graph_Renderer = function (container) {
517516
gui += `<span class="duration">Duration: ${duration}</span>`;
518517

519518
gui += '<ul class="stages">';
520-
stagesCount = instance.stages.length;
519+
var stagesCount = instance.stages.length;
521520
for (var i = 0; i < stagesCount; i++) {
522521
var stagesWidth = (node_id == current) ? 238 : 196;
523522
gui += '<li class="stage_bar ';

server/src/main/webapp/WEB-INF/rails/eslint-old.config.mjs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,12 @@
1616

1717
import globals from "globals";
1818
import js from "@eslint/js";
19-
import {FlatCompat} from "@eslint/eslintrc";
20-
21-
const compat = new FlatCompat({
22-
recommendedConfig: js.configs.recommended,
23-
});
2419

2520
export const nonWebPackedLegacyConfig = {
2621
files: ["app/assets/javascripts/**/*.js", "spec/javascripts/**/*.js"],
2722
ignores: ["spec/javascripts/support/**"],
2823

29-
extends: compat.extends("eslint:recommended"),
24+
extends: [js.configs.recommended],
3025

3126
languageOptions: {
3227
globals: {

server/src/main/webapp/WEB-INF/rails/eslint.config.mjs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,9 @@
1717
import {defineConfig, globalIgnores} from "eslint/config";
1818
import globals from "globals";
1919
import js from "@eslint/js";
20-
import {FlatCompat} from "@eslint/eslintrc";
2120
import {nonWebPackedLegacyConfig} from "./eslint-old.config.mjs";
2221
import {webpackedConfig} from "./eslint-webpacked.config.mjs";
2322

24-
const compat = new FlatCompat({
25-
recommendedConfig: js.configs.recommended,
26-
});
27-
2823
const globalIgnoreConfig = globalIgnores([
2924
"gems", // Gems
3025
"tmp", // Temporary typescript output dir
@@ -44,7 +39,7 @@ const buildScriptingConfig = {
4439
"webpack/**/*", // Webpacked JS linted separately
4540
"spec/**/*", // Webpacked JS linted separately
4641
],
47-
extends: compat.extends("eslint:recommended"),
42+
extends: [js.configs.recommended],
4843
languageOptions: {
4944
globals: {
5045
...globals.node,

server/src/main/webapp/WEB-INF/rails/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
"@babel/eslint-parser": "^7.28.6",
5454
"@babel/preset-env": "^7.29.0",
5555
"@babel/preset-react": "^7.28.5",
56+
"@eslint/js": "^9.39.2",
5657
"@types/awesomplete": "^1.1.16",
5758
"@types/fs-extra": "^11.0.4",
5859
"@types/jasmine": "^5.1.15",
@@ -76,6 +77,7 @@
7677
"file-loader": "^6.2.0",
7778
"fork-ts-checker-webpack-plugin": "^9.1.0",
7879
"fs-extra": "^11.3.3",
80+
"globals": "^17.3.0",
7981
"html-webpack-plugin": "^5.6.6",
8082
"jasmine": "^5.13.0",
8183
"jasmine-ajax": "^4.0.0",

server/src/main/webapp/WEB-INF/rails/yarn.lock

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1384,7 +1384,7 @@ __metadata:
13841384
languageName: node
13851385
linkType: hard
13861386

1387-
"@eslint/js@npm:9.39.2":
1387+
"@eslint/js@npm:9.39.2, @eslint/js@npm:^9.39.2":
13881388
version: 9.39.2
13891389
resolution: "@eslint/js@npm:9.39.2"
13901390
checksum: 10/6b7f676746f3111b5d1b23715319212ab9297868a0fa9980d483c3da8965d5841673aada2d5653e85a3f7156edee0893a7ae7035211b4efdcb2848154bb947f2
@@ -4808,6 +4808,13 @@ __metadata:
48084808
languageName: node
48094809
linkType: hard
48104810

4811+
"globals@npm:^17.3.0":
4812+
version: 17.3.0
4813+
resolution: "globals@npm:17.3.0"
4814+
checksum: 10/44ba2b7db93eb6a2531dfba09219845e21f2e724a4f400eb59518b180b7d5bcf7f65580530e3d3023d7dc2bdbacf5d265fd87c393f567deb9a2b0472b51c9d5e
4815+
languageName: node
4816+
linkType: hard
4817+
48114818
"globalthis@npm:^1.0.4":
48124819
version: 1.0.4
48134820
resolution: "globalthis@npm:1.0.4"
@@ -4861,6 +4868,7 @@ __metadata:
48614868
"@babel/eslint-parser": "npm:^7.28.6"
48624869
"@babel/preset-env": "npm:^7.29.0"
48634870
"@babel/preset-react": "npm:^7.28.5"
4871+
"@eslint/js": "npm:^9.39.2"
48644872
"@fortawesome/fontawesome-free": "npm:^6.7.2"
48654873
"@shopify/draggable": "npm:1.2.1"
48664874
"@types/awesomplete": "npm:^1.1.16"
@@ -4895,6 +4903,7 @@ __metadata:
48954903
fork-ts-checker-webpack-plugin: "npm:^9.1.0"
48964904
foundation-sites: "npm:^6.9.0"
48974905
fs-extra: "npm:^11.3.3"
4906+
globals: "npm:^17.3.0"
48984907
hack-font: "npm:^3.3.0"
48994908
html-webpack-plugin: "npm:^5.6.6"
49004909
jasmine: "npm:^5.13.0"

0 commit comments

Comments
 (0)