Skip to content

Commit

Permalink
Update esbuild-java version
Browse files Browse the repository at this point in the history
Signed-off-by: Phillip Kruger <[email protected]>
  • Loading branch information
phillip-kruger committed Sep 14, 2023
1 parent 0dddadb commit 4ec4a58
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import io.mvnpm.esbuild.Bundler;
import io.mvnpm.esbuild.model.BundleOptionsBuilder;
import io.mvnpm.esbuild.model.BundleResult;
import io.mvnpm.esbuild.model.BundleType;
import io.mvnpm.esbuild.model.EsBuildConfig;
import io.mvnpm.esbuild.model.EsBuildConfigBuilder;
import io.quarkiverse.web.bundler.deployment.WebBundlerConfig.LoadersConfig;
Expand Down Expand Up @@ -130,7 +131,7 @@ void bundle(WebBundlerConfig config,
}
boolean hasScssChange = isLiveReload
&& liveReload.getChangedResources().stream().anyMatch(WebBundlerProcessor::isSassFile);
final Bundler.BundleType type = Bundler.BundleType.valueOf(webDependencies.getType().toString());
final BundleType type = BundleType.valueOf(webDependencies.getType().toString());
final Path targetDir = outputTarget.getOutputDirectory().resolve(TARGET_DIR_NAME);
try {
if (!isLiveReload) {
Expand Down
4 changes: 3 additions & 1 deletion docs/modules/ROOT/pages/includes/attributes.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
:project-version: 1.1.1
:project-version: 1.1.2

:maven-version: 3.8.1+

:favicon: _images/logo.svg

:quarkus-org-url: https://github.com/quarkusio
:quarkus-base-url: {quarkus-org-url}/quarkus
:quarkus-clone-url: {quarkus-base-url}.git
Expand Down
36 changes: 33 additions & 3 deletions docs/modules/ROOT/pages/includes/quarkus-web-bundler.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ h|Default

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.web-root]]`link:#quarkus-web-bundler_quarkus.web-bundler.web-root[quarkus.web-bundler.web-root]`


[.description]
--
The directory in the resources which serves as root for the web assets
Expand All @@ -22,12 +23,14 @@ endif::add-copy-button-to-env-var[]
ifndef::add-copy-button-to-env-var[]
Environment variable: `+++QUARKUS_WEB_BUNDLER_WEB_ROOT+++`
endif::add-copy-button-to-env-var[]
--|String
--|link:https://docs.oracle.com/javase/8/docs/api/java/lang/String.html[String]

|`web`


a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.static]]`link:#quarkus-web-bundler_quarkus.web-bundler.static[quarkus.web-bundler.static]`


[.description]
--
Any static file to be served under this path
Expand All @@ -38,12 +41,14 @@ endif::add-copy-button-to-env-var[]
ifndef::add-copy-button-to-env-var[]
Environment variable: `+++QUARKUS_WEB_BUNDLER_STATIC+++`
endif::add-copy-button-to-env-var[]
--|String
--|link:https://docs.oracle.com/javase/8/docs/api/java/lang/String.html[String]

|`static`


a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.bundle]]`link:#quarkus-web-bundler_quarkus.web-bundler.bundle[quarkus.web-bundler.bundle]`


[.description]
--
Bundle files will be served under this path
Expand All @@ -54,12 +59,14 @@ endif::add-copy-button-to-env-var[]
ifndef::add-copy-button-to-env-var[]
Environment variable: `+++QUARKUS_WEB_BUNDLER_BUNDLE+++`
endif::add-copy-button-to-env-var[]
--|String
--|link:https://docs.oracle.com/javase/8/docs/api/java/lang/String.html[String]

|`static/bundle`


a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.presets.app]]`link:#quarkus-web-bundler_quarkus.web-bundler.presets.app[quarkus.web-bundler.presets.app]`


[.description]
--
Enable or disable this preset
Expand All @@ -76,6 +83,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.presets.app.entry-point-key]]`link:#quarkus-web-bundler_quarkus.web-bundler.presets.app.entry-point-key[quarkus.web-bundler.presets.app.entry-point-key]`


[.description]
--
The entry point key used for this preset (used in the output)
Expand All @@ -92,6 +100,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.presets.components]]`link:#quarkus-web-bundler_quarkus.web-bundler.presets.components[quarkus.web-bundler.presets.components]`


[.description]
--
Enable or disable this preset
Expand All @@ -108,6 +117,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.presets.components.entry-point-key]]`link:#quarkus-web-bundler_quarkus.web-bundler.presets.components.entry-point-key[quarkus.web-bundler.presets.components.entry-point-key]`


[.description]
--
The entry point key used for this preset (used in the output)
Expand All @@ -124,6 +134,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.loaders.js]]`link:#quarkus-web-bundler_quarkus.web-bundler.loaders.js[quarkus.web-bundler.loaders.js]`


[.description]
--
Configure the file extensions using the js loader: https://esbuild.github.io/content-types/++#++javascript
Expand All @@ -140,6 +151,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.loaders.jsx]]`link:#quarkus-web-bundler_quarkus.web-bundler.loaders.jsx[quarkus.web-bundler.loaders.jsx]`


[.description]
--
Configure the file extensions using the jsx loader: https://esbuild.github.io/content-types/++#++jsx
Expand All @@ -156,6 +168,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.loaders.tsx]]`link:#quarkus-web-bundler_quarkus.web-bundler.loaders.tsx[quarkus.web-bundler.loaders.tsx]`


[.description]
--
Configure the file extensions using the tsx loader: https://esbuild.github.io/content-types/++#++jsx
Expand All @@ -172,6 +185,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.loaders.ts]]`link:#quarkus-web-bundler_quarkus.web-bundler.loaders.ts[quarkus.web-bundler.loaders.ts]`


[.description]
--
Configure the file extensions using the ts loader: https://esbuild.github.io/content-types/++#++typescript
Expand All @@ -188,6 +202,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.loaders.css]]`link:#quarkus-web-bundler_quarkus.web-bundler.loaders.css[quarkus.web-bundler.loaders.css]`


[.description]
--
Configure the file extensions using the css loader: https://esbuild.github.io/content-types/++#++css
Expand All @@ -204,6 +219,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.loaders.local-css]]`link:#quarkus-web-bundler_quarkus.web-bundler.loaders.local-css[quarkus.web-bundler.loaders.local-css]`


[.description]
--
Configure the file extensions using the local-css loader: https://esbuild.github.io/content-types/++#++css
Expand All @@ -220,6 +236,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.loaders.global-css]]`link:#quarkus-web-bundler_quarkus.web-bundler.loaders.global-css[quarkus.web-bundler.loaders.global-css]`


[.description]
--
Configure the file extensions using the global-css loader: https://esbuild.github.io/content-types/++#++css
Expand All @@ -236,6 +253,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.loaders.file]]`link:#quarkus-web-bundler_quarkus.web-bundler.loaders.file[quarkus.web-bundler.loaders.file]`


[.description]
--
Configure the file extensions using the file loader: https://esbuild.github.io/content-types/++#++file This loader will copy the file to the output directory and embed the file name into the bundle as a string.
Expand All @@ -252,6 +270,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.loaders.copy]]`link:#quarkus-web-bundler_quarkus.web-bundler.loaders.copy[quarkus.web-bundler.loaders.copy]`


[.description]
--
Configure the file extensions using the copy loader: https://esbuild.github.io/content-types/++#++copy
Expand All @@ -268,6 +287,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.loaders.base64]]`link:#quarkus-web-bundler_quarkus.web-bundler.loaders.base64[quarkus.web-bundler.loaders.base64]`


[.description]
--
Configure the file extensions using the base64 loader: https://esbuild.github.io/content-types/++#++base64
Expand All @@ -284,6 +304,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.loaders.binary]]`link:#quarkus-web-bundler_quarkus.web-bundler.loaders.binary[quarkus.web-bundler.loaders.binary]`


[.description]
--
Configure the file extensions using the binary loader: https://esbuild.github.io/content-types/++#++binary
Expand All @@ -300,6 +321,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.loaders.data-url]]`link:#quarkus-web-bundler_quarkus.web-bundler.loaders.data-url[quarkus.web-bundler.loaders.data-url]`


[.description]
--
Configure the file extensions using the dataurl loader: https://esbuild.github.io/content-types/++#++data-url
Expand All @@ -316,6 +338,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.loaders.empty]]`link:#quarkus-web-bundler_quarkus.web-bundler.loaders.empty[quarkus.web-bundler.loaders.empty]`


[.description]
--
Configure the file extensions using the empty loader: https://esbuild.github.io/content-types/++#++empty-file
Expand All @@ -332,6 +355,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.loaders.text]]`link:#quarkus-web-bundler_quarkus.web-bundler.loaders.text[quarkus.web-bundler.loaders.text]`


[.description]
--
Configure the file extensions using the text loader: https://esbuild.github.io/content-types/++#++text
Expand All @@ -348,6 +372,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.loaders.json]]`link:#quarkus-web-bundler_quarkus.web-bundler.loaders.json[quarkus.web-bundler.loaders.json]`


[.description]
--
Configure the file extensions using the json loader: https://esbuild.github.io/content-types/++#++json
Expand All @@ -364,6 +389,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.dependencies.type]]`link:#quarkus-web-bundler_quarkus.web-bundler.dependencies.type[quarkus.web-bundler.dependencies.type]`


[.description]
--
The type used to collect web dependencies: web-jar or mvnpm
Expand All @@ -381,6 +407,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.charset]]`link:#quarkus-web-bundler_quarkus.web-bundler.charset[quarkus.web-bundler.charset]`


[.description]
--
The default charset
Expand All @@ -398,6 +425,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.bundle.-bundle]]`link:#quarkus-web-bundler_quarkus.web-bundler.bundle.-bundle[quarkus.web-bundler.bundle."bundle"]`


[.description]
--
Enable or disable this entry point. You can use this to use the map key as key and dir for this entry point.
Expand All @@ -414,6 +442,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.bundle.-bundle-.dir]]`link:#quarkus-web-bundler_quarkus.web-bundler.bundle.-bundle-.dir[quarkus.web-bundler.bundle."bundle".dir]`


[.description]
--
The directory for this entry point under the web root. By default, it will use the bundle map key.
Expand All @@ -430,6 +459,7 @@ endif::add-copy-button-to-env-var[]

a|icon:lock[title=Fixed at build time] [[quarkus-web-bundler_quarkus.web-bundler.bundle.-bundle-.key]]`link:#quarkus-web-bundler_quarkus.web-bundler.bundle.-bundle-.key[quarkus.web-bundler.bundle."bundle".key]`


[.description]
--
The key for this entry point By default, it will use the bundle map key.
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<maven.compiler.release>17</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.version>3.1.3.Final</quarkus.version>
<quarkus.version>3.3.2</quarkus.version>

<esbuild-java.version>1.0.3</esbuild-java.version>
<esbuild-java.version>1.0.4</esbuild-java.version>
<scrimage-core.version>4.0.39</scrimage-core.version>
<yuicompressor.version>2.4.8</yuicompressor.version>
</properties>
Expand Down

0 comments on commit 4ec4a58

Please sign in to comment.