Merge pull request #121 from ia3andy/bundle-deps

Bundle artifacts
mvnpm · Oct 1, 2024 · 4836e5b · 4836e5b
2 parents 30b39ea + bb4ed48
commit 4836e5b
Show file tree

Hide file tree

Showing 85 changed files with 681 additions and 357 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 target/
 .idea/
 *.iml
-/src/main/resources/**.tgz
+**/src/main/resources/**.tgz
 /nbactions.xml
diff --git a/bundle-original/pom.xml b/bundle-original/pom.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.mvnpm</groupId>
+        <artifactId>esbuild-java-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <artifactId>esbuild-java-bundle-original</artifactId>
+    <name>Esbuild wrapper for Java bundled with original binaries</name>
+    <properties>
+        <esbuild.version>0.23.0</esbuild.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>io.mvnpm</groupId>
+            <artifactId>esbuild-java</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources-filtered</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.revelc.code.formatter</groupId>
+                <artifactId>formatter-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>net.revelc.code</groupId>
+                <artifactId>impsort-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>${maven-antrun-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>download</id>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <target>
+                                <get dest="src/main/resources" skipexisting="true">
+                                    <url url="https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-${esbuild.version}.tgz"/>
+                                    <url url="https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-${esbuild.version}.tgz"/>
+                                    <url url="https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-${esbuild.version}.tgz"/>
+                                    <url url="https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-${esbuild.version}.tgz"/>
+                                    <url url="https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-${esbuild.version}.tgz"/>
+                                    <url url="https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-${esbuild.version}.tgz"/>
+                                    <url url="https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-${esbuild.version}.tgz"/>
+                                </get>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/bundle-original/src/main/resources-filtered/esbuild-java-version.properties b/bundle-original/src/main/resources-filtered/esbuild-java-version.properties
@@ -0,0 +1 @@
+esbuild.version=${esbuild.version}
diff --git a/bundle-original/src/test/java/io/mvnpm/esbuild/resolve/BundleResolverTest.java b/bundle-original/src/test/java/io/mvnpm/esbuild/resolve/BundleResolverTest.java
@@ -0,0 +1,35 @@
+package io.mvnpm.esbuild.resolve;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import io.mvnpm.esbuild.Bundler;
+
+public class BundleResolverTest extends BundleTester {
+
+    public static final Resolver THROWING_RESOLVER = version -> {
+        throw new RuntimeException("Should not call this");
+    };
+
+    @BeforeAll
+    public static void cleanUp() throws IOException {
+        cleanUpDefault();
+    }
+
+    @Test
+    public void resolve() throws IOException {
+        // when
+        final Path resolve = new BundledResolver(THROWING_RESOLVER).resolve(Bundler.ESBUILD_EMBEDDED_VERSION);
+
+        assertFalse(Bundler.ESBUILD_EMBEDDED_VERSION.contains("mvnpm"));
+
+        // then
+        assertTrue(resolve.toFile().exists());
+    }
+}
diff --git a/...o/mvnpm/esbuild/resolve/BundleTester.java → ...o/mvnpm/esbuild/resolve/BundleTester.java b/...o/mvnpm/esbuild/resolve/BundleTester.java → ...o/mvnpm/esbuild/resolve/BundleTester.java
diff --git a/bundle-scss/pom.xml b/bundle-scss/pom.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.mvnpm</groupId>
+        <artifactId>esbuild-java-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <artifactId>esbuild-java-bundle-scss</artifactId>
+    <name>Esbuild wrapper for Java bundled with mvnpm scss binaries</name>
+    <packaging>jar</packaging>
+    <properties>
+        <esbuild.scss.version>v0.0.8</esbuild.scss.version>
+        <esbuild.version>0.23.0-mvnpm-0.0.8</esbuild.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>io.mvnpm</groupId>
+            <artifactId>esbuild-java</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources-filtered</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>net.revelc.code.formatter</groupId>
+                <artifactId>formatter-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>net.revelc.code</groupId>
+                <artifactId>impsort-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>${maven-antrun-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>download</id>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <target>
+                                <get dest="src/main/resources" skipexisting="true">
+                                    <url url="https://github.com/mvnpm/esbuild/releases/download/${esbuild.scss.version}/esbuild-darwin-arm64-${esbuild.version}.tgz"/>
+                                    <url url="https://github.com/mvnpm/esbuild/releases/download/${esbuild.scss.version}/esbuild-darwin-x64-${esbuild.version}.tgz"/>
+                                    <url url="https://github.com/mvnpm/esbuild/releases/download/${esbuild.scss.version}/esbuild-win32-x64-${esbuild.version}.tgz"/>
+                                    <url url="https://github.com/mvnpm/esbuild/releases/download/${esbuild.scss.version}/esbuild-win32-ia32-${esbuild.version}.tgz"/>
+                                    <url url="https://github.com/mvnpm/esbuild/releases/download/${esbuild.scss.version}/esbuild-linux-arm64-${esbuild.version}.tgz"/>
+                                    <url url="https://github.com/mvnpm/esbuild/releases/download/${esbuild.scss.version}/esbuild-linux-x64-${esbuild.version}.tgz"/>
+                                    <url url="https://github.com/mvnpm/esbuild/releases/download/${esbuild.scss.version}/esbuild-linux-ia32-${esbuild.version}.tgz"/>
+                                </get>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/bundle-scss/src/main/resources-filtered/esbuild-java-version.properties b/bundle-scss/src/main/resources-filtered/esbuild-java-version.properties
@@ -0,0 +1,2 @@
+esbuild.scss.version=${esbuild.scss.version}
+esbuild.version=${esbuild.version}
diff --git a/...m/esbuild/resolve/BundleResolverTest.java → ...m/esbuild/resolve/BundleResolverTest.java b/...m/esbuild/resolve/BundleResolverTest.java → ...m/esbuild/resolve/BundleResolverTest.java
@@ -25,7 +25,7 @@ public static void cleanUp() throws IOException {
     public void resolve() throws IOException {
         // when
         final Path resolve = new BundledResolver(THROWING_RESOLVER).resolve(Bundler.ESBUILD_EMBEDDED_VERSION);
-
+        assertTrue(Bundler.ESBUILD_EMBEDDED_VERSION.contains("mvnpm"));
         // then
         assertTrue(resolve.toFile().exists());
     }

diff --git a/bundle-scss/src/test/java/io/mvnpm/esbuild/resolve/BundleTester.java b/bundle-scss/src/test/java/io/mvnpm/esbuild/resolve/BundleTester.java
@@ -0,0 +1,17 @@
+package io.mvnpm.esbuild.resolve;
+
+import java.io.IOException;
+
+import io.mvnpm.esbuild.Bundler;
+import io.mvnpm.esbuild.util.PathUtils;
+
+public abstract class BundleTester {
+
+    public static void cleanUp(String version) throws IOException {
+        PathUtils.deleteRecursive(Resolvers.getLocation(version));
+    }
+
+    public static void cleanUpDefault() throws IOException {
+        cleanUp(Bundler.ESBUILD_EMBEDDED_VERSION);
+    }
+}
diff --git a/core/pom.xml b/core/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.mvnpm</groupId>
+        <artifactId>esbuild-java-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <artifactId>esbuild-java</artifactId>
+    <name>Esbuild wrapper for Java</name>
+
+    <description>Small wrapper around esbuild to be able to use it in Java</description>
+    <properties>
+        <esbuild.scss.version>v0.0.8</esbuild.scss.version>
+        <esbuild.version>0.23.0-mvnpm-0.0.8</esbuild.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.mvnpm</groupId>
+            <artifactId>importmap</artifactId>
+            <version>1.0.10</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources-filtered</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>java.util.logging.config.file</name>
+                            <value>src/test/resources/logging.properties</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>net.revelc.code.formatter</groupId>
+                <artifactId>formatter-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>net.revelc.code</groupId>
+                <artifactId>impsort-maven-plugin</artifactId>
+            </plugin>
+
+        </plugins>
+    </build>
+
+</project>
diff --git a/.../io/mvnpm/esbuild/BuildEventListener.java → .../io/mvnpm/esbuild/BuildEventListener.java b/.../io/mvnpm/esbuild/BuildEventListener.java → .../io/mvnpm/esbuild/BuildEventListener.java
diff --git a/...ava/io/mvnpm/esbuild/BundleException.java → ...ava/io/mvnpm/esbuild/BundleException.java b/...ava/io/mvnpm/esbuild/BundleException.java → ...ava/io/mvnpm/esbuild/BundleException.java
diff --git a/src/main/java/io/mvnpm/esbuild/Bundler.java → ...c/main/java/io/mvnpm/esbuild/Bundler.java b/src/main/java/io/mvnpm/esbuild/Bundler.java → ...c/main/java/io/mvnpm/esbuild/Bundler.java
diff --git a/src/main/java/io/mvnpm/esbuild/Execute.java → ...c/main/java/io/mvnpm/esbuild/Execute.java b/src/main/java/io/mvnpm/esbuild/Execute.java → ...c/main/java/io/mvnpm/esbuild/Execute.java
diff --git a/src/main/java/io/mvnpm/esbuild/Main.java → .../src/main/java/io/mvnpm/esbuild/Main.java b/src/main/java/io/mvnpm/esbuild/Main.java → .../src/main/java/io/mvnpm/esbuild/Main.java
diff --git a/src/main/java/io/mvnpm/esbuild/Watch.java → ...src/main/java/io/mvnpm/esbuild/Watch.java b/src/main/java/io/mvnpm/esbuild/Watch.java → ...src/main/java/io/mvnpm/esbuild/Watch.java
diff --git a/...npm/esbuild/install/InstallException.java → ...npm/esbuild/install/InstallException.java b/...npm/esbuild/install/InstallException.java → ...npm/esbuild/install/InstallException.java
diff --git a/...a/io/mvnpm/esbuild/install/MvnpmInfo.java → ...a/io/mvnpm/esbuild/install/MvnpmInfo.java b/...a/io/mvnpm/esbuild/install/MvnpmInfo.java → ...a/io/mvnpm/esbuild/install/MvnpmInfo.java
diff --git a/...npm/esbuild/install/WebDepsInstaller.java → ...npm/esbuild/install/WebDepsInstaller.java b/...npm/esbuild/install/WebDepsInstaller.java → ...npm/esbuild/install/WebDepsInstaller.java
diff --git a/...o/mvnpm/esbuild/model/AutoEntryPoint.java → ...o/mvnpm/esbuild/model/AutoEntryPoint.java b/...o/mvnpm/esbuild/model/AutoEntryPoint.java → ...o/mvnpm/esbuild/model/AutoEntryPoint.java
diff --git a/...io/mvnpm/esbuild/model/BundleOptions.java → ...io/mvnpm/esbuild/model/BundleOptions.java b/...io/mvnpm/esbuild/model/BundleOptions.java → ...io/mvnpm/esbuild/model/BundleOptions.java
diff --git a/...m/esbuild/model/BundleOptionsBuilder.java → ...m/esbuild/model/BundleOptionsBuilder.java b/...m/esbuild/model/BundleOptionsBuilder.java → ...m/esbuild/model/BundleOptionsBuilder.java
diff --git a/.../io/mvnpm/esbuild/model/BundleResult.java → .../io/mvnpm/esbuild/model/BundleResult.java b/.../io/mvnpm/esbuild/model/BundleResult.java → .../io/mvnpm/esbuild/model/BundleResult.java
diff --git a/...sbuild/model/DependenciesAutoImports.java → ...sbuild/model/DependenciesAutoImports.java b/...sbuild/model/DependenciesAutoImports.java → ...sbuild/model/DependenciesAutoImports.java
diff --git a/...va/io/mvnpm/esbuild/model/EntryPoint.java → ...va/io/mvnpm/esbuild/model/EntryPoint.java b/...va/io/mvnpm/esbuild/model/EntryPoint.java → ...va/io/mvnpm/esbuild/model/EntryPoint.java
diff --git a/...io/mvnpm/esbuild/model/EsBuildConfig.java → ...io/mvnpm/esbuild/model/EsBuildConfig.java b/...io/mvnpm/esbuild/model/EsBuildConfig.java → ...io/mvnpm/esbuild/model/EsBuildConfig.java
diff --git a/...m/esbuild/model/EsBuildConfigBuilder.java → ...m/esbuild/model/EsBuildConfigBuilder.java b/...m/esbuild/model/EsBuildConfigBuilder.java → ...m/esbuild/model/EsBuildConfigBuilder.java
diff --git a/...io/mvnpm/esbuild/model/ExecuteResult.java → ...io/mvnpm/esbuild/model/ExecuteResult.java b/...io/mvnpm/esbuild/model/ExecuteResult.java → ...io/mvnpm/esbuild/model/ExecuteResult.java
diff --git a/...o/mvnpm/esbuild/model/FileEntryPoint.java → ...o/mvnpm/esbuild/model/FileEntryPoint.java b/...o/mvnpm/esbuild/model/FileEntryPoint.java → ...o/mvnpm/esbuild/model/FileEntryPoint.java
diff --git a/...mvnpm/esbuild/model/WatchBuildResult.java → ...mvnpm/esbuild/model/WatchBuildResult.java b/...mvnpm/esbuild/model/WatchBuildResult.java → ...mvnpm/esbuild/model/WatchBuildResult.java
diff --git a/...mvnpm/esbuild/model/WatchStartResult.java → ...mvnpm/esbuild/model/WatchStartResult.java b/...mvnpm/esbuild/model/WatchStartResult.java → ...mvnpm/esbuild/model/WatchStartResult.java
diff --git a/...io/mvnpm/esbuild/model/WebDependency.java → ...io/mvnpm/esbuild/model/WebDependency.java b/...io/mvnpm/esbuild/model/WebDependency.java → ...io/mvnpm/esbuild/model/WebDependency.java
diff --git a/...vnpm/esbuild/resolve/BundledResolver.java → ...vnpm/esbuild/resolve/BundledResolver.java b/...vnpm/esbuild/resolve/BundledResolver.java → ...vnpm/esbuild/resolve/BundledResolver.java
@@ -1,15 +1,15 @@
 package io.mvnpm.esbuild.resolve;
 
-import static io.mvnpm.esbuild.Bundler.ESBUILD_EMBEDDED_VERSION;
 import static io.mvnpm.esbuild.resolve.Resolvers.*;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.logging.Logger;
 
 public class BundledResolver implements Resolver {
-
+    private static final Logger logger = Logger.getLogger(DownloadResolver.class.getName());
     private final Resolver fallbackResolver;
 
     public BundledResolver(Resolver fallbackResolver) {
@@ -18,19 +18,22 @@ public BundledResolver(Resolver fallbackResolver) {
 
     @Override
     public Path resolve(String version) throws IOException {
-        final Path path = getLocation(ESBUILD_EMBEDDED_VERSION);
-        final String bundledExecutableRelativePath = resolveBundledExecutablePath();
-        final Path executablePath = path.resolve(bundledExecutableRelativePath);
-        if (Files.isExecutable(executablePath)) {
+        final Path path = getLocation(version);
+        final Path executablePath = resolveExecutablePath(path);
+        if (Files.isExecutable(path)) {
             return executablePath;
         }
 
-        final InputStream resource = getClass().getResourceAsStream("/esbuild-%s-%s.tgz".formatted(CLASSIFIER, version));
+        final String tgz = getTgzPath(version);
+        final InputStream resource = getClass().getResourceAsStream(tgz);
 
         if (resource != null) {
-            return extract(resource, ESBUILD_EMBEDDED_VERSION).resolve(bundledExecutableRelativePath);
+            final Path bundleDir = extract(resource, version);
+            return requireExecutablePath(bundleDir);
         }
 
         return fallbackResolver.resolve(version);
+
     }
+
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		esbuild.scss.version=${esbuild.scss.version}
		esbuild.version=${esbuild.version}