Merge pull request #30407 from quarkusio/fix-bad-JS-identifier

Fix invalid JavaScript identifier in DevUI sourceMaps
quarkusio · Jan 17, 2023 · 2264061 · 2264061
2 parents 69edabb + 5079fd0
commit 2264061
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/...t/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleProcessor.java b/...t/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsoleProcessor.java
@@ -928,7 +928,7 @@ public Object apply(EvalContext ctx) {
             String ctxName = ctx.getName();
 
             List<Path> sourcesDir = DevConsoleManager.getHotReplacementContext().getSourcesDir();
-            if (ctxName.equals("sourcePackages")) {
+            if (ctxName.endsWith("sourcePackages")) {
                 if (disable) {
                     return Collections.emptyList(); // we need this here because the result needs to be iterable
                 }
@@ -938,12 +938,15 @@ public Object apply(EvalContext ctx) {
                     String lang = sourcePaths.getFileName().toString();
                     List<String> packages = sourcePackagesForRoot(sourcePaths);
                     if (!packages.isEmpty()) {
-                        sourcePackagesByLang.put(lang, packages);
+                        // The `replace` is used to avoid invalid JavaScript identifier (using `-`)
+                        // It happens when using Gradle and extensions generating code (Avro, gRPC...)
+                        // See https://github.com/quarkusio/quarkus/issues/30288.
+                        sourcePackagesByLang.put(lang.replace("-", "_"), packages);
                     }
                 }
                 return sourcePackagesByLang;
             }
-            if (ctxName.equals("locationPackages")) {
+            if (ctxName.endsWith("locationPackages")) {
                 if (disable) {
                     return Collections.emptyList(); // we need this here because the result needs to be iterable
                 }