Merge remote-tracking branch 'origin/develop' into dependabot/maven/c…

…nf/develop/org.jetbrains.kotlin-kotlin-osgi-bundle-2.1.10
OpenEMS · Jan 30, 2025 · 352a4f1 · 352a4f1
2 parents 773dd3d + 43a42fb
commit 352a4f1
Show file tree

Hide file tree

Showing 6 changed files with 10,917 additions and 12,517 deletions.
diff --git a/cnf/pom.xml b/cnf/pom.xml
@@ -231,7 +231,7 @@
 			<!-- Changelog: https://github.com/apache/felix-dev/commits/master/http -->
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.http.jetty</artifactId>
-			<version>5.1.26</version>
+			<version>5.1.28</version>
 		</dependency>
 		<dependency>
 			<!-- Apache Felix Servlet API -->

diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
@@ -109,7 +109,7 @@
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.eventadmin;version='[1.6.4,1.6.5)',\
 	org.apache.felix.fileinstall;version='[3.7.4,3.7.5)',\
-	org.apache.felix.http.jetty;version='[5.1.26,5.1.27)',\
+	org.apache.felix.http.jetty;version='[5.1.28,5.1.29)',\
 	org.apache.felix.http.servlet-api;version='[3.0.0,3.0.1)',\
 	org.apache.felix.inventory;version='[2.0.0,2.0.1)',\
 	org.apache.felix.metatype;version='[1.2.4,1.2.5)',\

diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
@@ -416,7 +416,7 @@
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.eventadmin;version='[1.6.4,1.6.5)',\
 	org.apache.felix.fileinstall;version='[3.7.4,3.7.5)',\
-	org.apache.felix.http.jetty;version='[5.1.26,5.1.27)',\
+	org.apache.felix.http.jetty;version='[5.1.28,5.1.29)',\
 	org.apache.felix.http.servlet-api;version='[3.0.0,3.0.1)',\
 	org.apache.felix.inventory;version='[2.0.0,2.0.1)',\
 	org.apache.felix.metatype;version='[1.2.4,1.2.5)',\

diff --git a/ui/.eslintrc.json → ui/eslint.config.mjs b/ui/.eslintrc.json → ui/eslint.config.mjs
@@ -1,38 +1,59 @@
-{
-  "root": true,
-  "ignorePatterns": [
-    "projects/**/*"
-  ],
-  "overrides": [
-    {
-      "files": [
-        "*.ts"
-      ],
-      "env": {
-        "browser": true,
-        "node": true,
-        "jest": true
-      },
-      "parserOptions": {
-        "project": [
-          "tsconfig.json"
-        ],
-        "createDefaultProgram": true
-      },
-      "plugins": [
-        "import",
-        "unused-imports",
-        "@stylistic",
-        "check-file"
-      ],
-      "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended",
-        "plugin:@angular-eslint/recommended",
-        "plugin:@angular-eslint/template/process-inline-templates",
-        "plugin:import/recommended"
-      ],
-      "rules": {
+import unusedImports from "eslint-plugin-unused-imports";
+import stylistic from "@stylistic/eslint-plugin";
+import globals from "globals";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+import importPlugin from "eslint-plugin-import";
+import checkFile from "eslint-plugin-check-file";
+
+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 [{
+    "ignores": ["projects/**/*"],
+}, ...compat.extends(
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:@angular-eslint/recommended",
+    "plugin:@angular-eslint/template/process-inline-templates",
+    "plugin:import/recommended"
+).map(config => ({
+    ...config,
+    "files": ["**/*.ts"],
+})), {
+    "files": ["**/*.ts"],
+
+    "plugins": {
+        "unused-imports": unusedImports,
+        "@stylistic": stylistic,
+        "import": importPlugin,
+        "check-file": checkFile,
+    },
+
+    "languageOptions": {
+        "globals": {
+            ...globals.browser,
+            ...globals.node,
+            ...globals.jest,
+        },
+
+        "ecmaVersion": 5,
+        "sourceType": "commonjs",
+
+        "parserOptions": {
+            "project": ["tsconfig.json"],
+            "createDefaultProgram": true,
+        },
+    },
+
+    "rules": {
         "check-file/filename-naming-convention": [
           "off",
           {
@@ -126,33 +147,24 @@
             "message": "Using 'xdescribe' is not allowed."
           }
         ]
-      },
-      "overrides": [
-        {
-          "files": [
-            "*.component.ts",
-            "*.service.ts",
-            "*.module.ts"
-          ],
-          "rules": {
-            "check-file/filename-naming-convention": "off"
-          }
-        }
-      ],
-      "settings": {
-        "import/resolver": {
-          "typescript": {}
-        }
-      }
     },
-    {
-      "files": [
-        "*.html"
-      ],
-      "extends": [
-        "plugin:@angular-eslint/template/recommended"
-      ],
-      "rules": {}
+    "settings": {
+      "import/resolver": {
+        "typescript": {}
+      }
     }
-  ]
-}
+}, {
+    "files": ["*.component.ts", "*.service.ts", "*.module.ts"],
+    "plugins": {
+        "check-file": checkFile,
+    },
+    "rules": {
+        "check-file/filename-naming-convention": "off",
+    },
+}, ...compat.extends("plugin:@angular-eslint/template/recommended").map(config => ({
+    ...config,
+    "files": ["**/*.html"],
+})), {
+    "files": ["**/*.html"],
+    "rules": {},
+}];