You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by be...@apache.org on 2024/05/11 11:19:46 UTC
(tapestry-5) 02/02: TAP5-2605: google closure compiler use generic filename
This is an automated email from the ASF dual-hosted git repository.
benw pushed a commit to branch javax
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit b1e144c74129ff7da0998eee9f9e3e6b7163b9d9
Author: Ben Weidig <be...@netzgut.net>
AuthorDate: Sat May 11 12:50:33 2024 +0200
TAP5-2605: google closure compiler use generic filename
---
.../tapestry5/internal/webresources/GoogleClosureMinimizer.java | 6 ++++--
.../webresources/GoogleClosureMinimizerOptionsProvider.java | 1 -
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java
index 1fee97dd0..b134b2bad 100644
--- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java
+++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/GoogleClosureMinimizer.java
@@ -94,7 +94,8 @@ public class GoogleClosureMinimizer extends AbstractMinimizer
compiler.disableThreads();
String source = IOUtils.toString(resource.openStream(), StandardCharsets.UTF_8);
- SourceFile input = SourceFile.fromCode(resource.toString(), source);
+
+ SourceFile input = SourceFile.fromCode("streamable-resource", source);
List<SourceFile> inputs = Collections.singletonList(input);
@@ -105,7 +106,8 @@ public class GoogleClosureMinimizer extends AbstractMinimizer
return IOUtils.toInputStream(compiler.toSource(), StandardCharsets.UTF_8);
}
- throw new RuntimeException(String.format("Compilation failed: %s.",
+ throw new RuntimeException(String.format("Compilation failed for %s. Errors: %s.",
+ resource,
InternalUtils.join(CollectionFactory.newList(result.errors), ";")));
}
}
diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/webresources/GoogleClosureMinimizerOptionsProvider.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/webresources/GoogleClosureMinimizerOptionsProvider.java
index 906c797df..34cfc8d41 100644
--- a/tapestry-webresources/src/main/java/org/apache/tapestry5/webresources/GoogleClosureMinimizerOptionsProvider.java
+++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/webresources/GoogleClosureMinimizerOptionsProvider.java
@@ -4,7 +4,6 @@ import java.util.Optional;
import org.apache.tapestry5.services.assets.StreamableResource;
-import com.google.javascript.jscomp.Compiler;
import com.google.javascript.jscomp.CompilerOptions;
/**