Merge branch 'master' into logging-exMTL

Author: jimklimov

.github/dependabot.yml

@@ -1,10 +1,5 @@
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
 version: 2
 updates:
-  # Intentionally not adding automatic NPM updates because I do
-  # not trust the plugin's tests to catch issues caused by updates.
-  # TODO or enable, but avoid merging without first doing a local interactive test?
   - package-ecosystem: "maven"
     directory: "/"
     schedule:
@@ -19,3 +14,13 @@ updates:
     directory: "/plugin"
     schedule:
       interval: "weekly"
+    groups:
+      javascript-production:
+        applies-to: version-updates
+        dependency-type: production
+      javascript-development:
+        applies-to: version-updates
+        dependency-type: development
+      javascript-security:
+        applies-to: security-updates
+        dependency-type: production

.gitignore

@@ -2,6 +2,7 @@ target
 work
 node
 node_modules
+.yarn/
 .idea/
 *.iml
 .classpath

lib/src/main/java/com/cloudbees/groovy/cps/SerializableScript.java

@@ -1,5 +1,7 @@
 package com.cloudbees.groovy.cps;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 import groovy.lang.Binding;
 import groovy.lang.Script;
 
@@ -26,6 +28,7 @@ private void writeObject(ObjectOutputStream oos) throws IOException {
         oos.writeObject(getBinding().getVariables());
     }
 
+    @SuppressFBWarnings(value = "MC_OVERRIDABLE_METHOD_CALL_IN_READ_OBJECT", justification = "TODO needs triage")
     private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
         Map m = (Map)ois.readObject();
         getBinding().getVariables().putAll(m);

lib/src/main/java/com/cloudbees/groovy/cps/impl/FunctionCallBlock.java

@@ -7,7 +7,6 @@
 import com.cloudbees.groovy.cps.Next;
 import com.cloudbees.groovy.cps.sandbox.CallSiteTag;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -42,7 +41,6 @@ public class FunctionCallBlock extends CallSiteBlockSupport {
 
     private final boolean safe;
 
-    @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "Block array is constructed during compilation, is not mutated, and is never exposed")
     public FunctionCallBlock(SourceLocation loc, Collection<CallSiteTag> tags, Block lhsExp, Block nameExp, boolean safe, Block[] argExps) {
         super(tags);
         this.loc = loc;

plugin/.eslintignore

@@ -0,0 +1 @@
+nodeLinker: node-modules

plugin/.eslintrc.js

@@ -0,0 +1,40 @@
+import { defineConfig, globalIgnores } from "eslint/config";
+import globals from "globals";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default defineConfig([globalIgnores([
+    "**/work",
+    "**/target",
+    "rebel.xml",
+    "**/node/",
+    "**/node_modules/",
+    "**/jsbundles",
+    "src/main/webapp/css/*",
+    "src/main/webapp/icons/*",
+]), {
+    extends: compat.extends("eslint:recommended"),
+
+    languageOptions: {
+        globals: {
+            ...globals.browser,
+        },
+
+        ecmaVersion: 2022,
+        sourceType: "module",
+    },
+
+    rules: {
+        curly: "error",
+    },
+}]);

plugin/.mvn_exec_yarn renamed to plugin/.mvn_exec_yarn_corepack

@@ -10,43 +10,50 @@
     "prod": "webpack --config webpack.prod.js",
     "start": "yarn dev --watch",
     "lint:js": "eslint src/main/js --ext js",
+    "lint:js-ci": "eslint src/main/js -f checkstyle -o target/eslint-warnings.xml --ext js",
     "mvnbuild": "yarn prod",
-    "mvntest": "yarn lint:js"
+    "mvntest": "if-env CI=true && yarn lint:js-ci || yarn lint:js"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/jenkinsci/workflow-cps-plugin"
   },
   "readme": "../README.md",
   "devDependencies": {
-    "@babel/cli": "^7.19.3",
-    "@babel/core": "^7.19.3",
-    "@babel/preset-env": "^7.19.3",
-    "autoprefixer": "^10.4.13",
-    "babel-loader": "^9.0.1",
+    "@babel/cli": "^7.27.0",
+    "@babel/core": "^7.26.10",
+    "@babel/preset-env": "^7.26.9",
+    "@delucis/if-env": "^1.1.2",
+    "@eslint/eslintrc": "^3.3.1",
+    "@eslint/js": "^9.24.0",
+    "autoprefixer": "^10.4.21",
+    "babel-loader": "^10.0.0",
     "clean-webpack-plugin": "^4.0.0",
-    "css-loader": "^5.0.0",
-    "eslint": "^8.41.0",
+    "css-loader": "^7.1.2",
+    "eslint": "^9.24.0",
+    "eslint-formatter-checkstyle": "^8.40.0",
     "eslint-plugin-only-warn": "^1.1.0",
-    "less": "^3.12.2",
-    "less-loader": "^7.0.2",
-    "mini-css-extract-plugin": "^1.2.1",
+    "globals": "^16.0.0",
+    "less": "^4.3.0",
+    "less-loader": "^12.2.0",
+    "mini-css-extract-plugin": "^2.9.2",
     "postcss": "^8.4.35",
-    "postcss-less": "^4.0.0",
-    "postcss-loader": "^4.0.4",
-    "style-loader": "^2.0.0",
-    "webpack": "^5.76.3",
-    "webpack-cli": "^5.0.1",
+    "postcss-less": "^6.0.0",
+    "postcss-loader": "^8.1.1",
+    "style-loader": "^4.0.0",
+    "webpack": "^5.99.5",
+    "webpack-cli": "^6.0.1",
     "webpack-fix-style-only-entries": "^0.6.1",
-    "webpack-merge": "^5.8.0"
+    "webpack-merge": "^6.0.1"
   },
   "dependencies": {
-    "ace-builds": "^1.15.0",
-    "jquery": "^3.6.1",
-    "jquery-ui": "^1.13.2"
+    "ace-builds": "^1.40.0",
+    "jquery": "^3.7.1",
+    "jquery-ui": "^1.14.1"
   },
   "browserslist": [
     "defaults",
     "not IE 11"
-  ]
+  ],
+  "packageManager": "[email protected]"
 }