New esbuild-java with scss-loader (#147)

* New esbuild-java with scss-loader * added scss * Revert "added scss" This reverts commit c13e4d4. * New esbuild-java with scss-loader --------- Co-authored-by: Erik Jan de Wit <[email protected]>
quarkiverse · Feb 5, 2024 · d73ebba · d73ebba
1 parent a3839af
commit d73ebba
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 182 deletions.
diff --git a/deployment/pom.xml b/deployment/pom.xml
@@ -18,11 +18,6 @@
       <artifactId>quarkus-web-bundler</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>io.quarkiverse.web-bundler</groupId>
-      <artifactId>quarkus-web-bundler-sass-compiler</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>io.quarkus.qute</groupId>
       <artifactId>qute-core</artifactId>

diff --git a/deployment/src/main/java/io/quarkiverse/web/bundler/deployment/WebBundlerProcessor.java b/deployment/src/main/java/io/quarkiverse/web/bundler/deployment/WebBundlerProcessor.java
@@ -9,19 +9,9 @@
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.nio.file.StandardOpenOption;
+import java.nio.file.*;
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -30,25 +20,14 @@
 
 import io.mvnpm.esbuild.BundleException;
 import io.mvnpm.esbuild.Bundler;
-import io.mvnpm.esbuild.model.BundleOptions;
-import io.mvnpm.esbuild.model.BundleOptionsBuilder;
-import io.mvnpm.esbuild.model.BundleResult;
-import io.mvnpm.esbuild.model.EsBuildConfig;
-import io.mvnpm.esbuild.model.EsBuildConfigBuilder;
-import io.mvnpm.esbuild.model.WebDependency;
+import io.mvnpm.esbuild.model.*;
 import io.quarkiverse.web.bundler.deployment.WebBundlerConfig.LoadersConfig;
-import io.quarkiverse.web.bundler.deployment.items.BundleConfigAssetsBuildItem;
-import io.quarkiverse.web.bundler.deployment.items.BundleWebAsset;
-import io.quarkiverse.web.bundler.deployment.items.EntryPointBuildItem;
-import io.quarkiverse.web.bundler.deployment.items.GeneratedBundleBuildItem;
-import io.quarkiverse.web.bundler.deployment.items.WebAsset;
-import io.quarkiverse.web.bundler.deployment.items.WebDependenciesBuildItem;
+import io.quarkiverse.web.bundler.deployment.items.*;
 import io.quarkiverse.web.bundler.deployment.staticresources.GeneratedStaticResourceBuildItem;
 import io.quarkiverse.web.bundler.deployment.staticresources.GeneratedStaticResourceBuildItem.WatchMode;
 import io.quarkiverse.web.bundler.runtime.Bundle;
 import io.quarkiverse.web.bundler.runtime.BundleRedirectHandlerRecorder;
 import io.quarkiverse.web.bundler.runtime.WebBundlerBuildRecorder;
-import io.quarkiverse.web.bundler.sass.SassBuildTimeCompiler;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.builder.BuildException;
@@ -147,7 +126,6 @@ void bundle(WebBundlerConfig config,
             }
 
             final Map<String, EsBuildConfig.Loader> loaders = computeLoaders(config);
-            loaders.put(".scss", EsBuildConfig.Loader.CSS);
             final EsBuildConfigBuilder esBuildConfigBuilder = new EsBuildConfigBuilder()
                     .loader(loaders)
                     .publicPath(config.publicBundlePath())
@@ -230,14 +208,6 @@ void bundle(WebBundlerConfig config,
                     }
                 }
                 final long startedBundling = Instant.now().toEpochMilli();
-                // SCSS conversion
-                if (!isLiveReload || hasScssChange) {
-                    try (Stream<Path> stream = Files.find(targetDir, Integer.MAX_VALUE,
-                            (p, a) -> !p.toString().contains("node_modules")
-                                    && isCompiledSassFile(p.getFileName().toString()))) {
-                        stream.forEach(p -> convertToScss(p, targetDir));
-                    }
-                }
                 final BundleResult result = Bundler.bundle(options, false);
                 if (!result.result().output().isBlank()) {
                     LOGGER.debugf(result.result().output());
@@ -295,18 +265,6 @@ private Map<String, EsBuildConfig.Loader> computeLoaders(WebBundlerConfig config
         return loaders;
     }
 
-    static void convertToScss(Path file, Path root) {
-        LOGGER.debugf("Converting %s to css", file);
-        String content = SassBuildTimeCompiler.convertScss(file, root, (s, s2) -> {
-        });
-        try {
-            Files.writeString(file, content, StandardOpenOption.CREATE,
-                    StandardOpenOption.TRUNCATE_EXISTING);
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
     void handleBundleDistDir(WebBundlerConfig config, BuildProducer<GeneratedBundleBuildItem> generatedBundleProducer,
             BuildProducer<GeneratedStaticResourceBuildItem> staticResourceProducer, Path bundleDir, Long started,
             boolean changed) {
@@ -378,14 +336,6 @@ void initBundleRedirect(WebBundlerConfig config, BuildProducer<RouteBuildItem> r
         }
     }
 
-    /**
-     * Returns true if the given filename (not path) does not start with _
-     * and ends with either .sass or .scss case-insensitive
-     */
-    public static boolean isCompiledSassFile(String filename) {
-        return !filename.startsWith("_") && isSassFile(filename);
-    }
-
     public static boolean isImportSassFile(String filename) {
         return filename.startsWith("_") && isSassFile(filename);
     }

diff --git a/deployment/src/test/resources/application.properties b/deployment/src/test/resources/application.properties
@@ -1,2 +1,4 @@
 quarkus.web-bundler.dependencies.compile-only=false
-quarkus.web-bundler.bundle-redirect=true
+quarkus.web-bundler.bundle-redirect=true
+quarkus.log.category."io.quarkiverse.web.bundler".level=DEBUG
+quarkus.log.category."io.mvnpm.esbuild".level=DEBUG
diff --git a/integration-tests/src/main/resources/web/components/calendar/_imported.scss b/integration-tests/src/main/resources/web/components/calendar/_imported.scss
@@ -1,7 +1,5 @@
-
-
 .calendar {
   h1 {
     background-color: red;
   }
-}
+}
diff --git a/integration-tests/src/main/resources/web/components/calendar/calendar.scss b/integration-tests/src/main/resources/web/components/calendar/calendar.scss
@@ -8,4 +8,4 @@
       color: red;
     }
   }
-}
+}
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,6 @@
   <packaging>pom</packaging>
   <name>Quarkus Web Bundler - Parent</name>
   <modules>
-    <module>sass-compiler</module>
     <module>common-deployment</module>
     <module>runtime</module>
     <module>deployment</module>
@@ -32,7 +31,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.version>3.7.0</quarkus.version>
 
-    <esbuild-java.version>1.1.2</esbuild-java.version>
+    <esbuild-java.version>1.2.0.CR1</esbuild-java.version>
     <scrimage-core.version>4.1.1</scrimage-core.version>
     <yuicompressor.version>2.4.8</yuicompressor.version>
   </properties>

diff --git a/sass-compiler/pom.xml b/sass-compiler/pom.xml
diff --git a/sass-compiler/src/main/java/io/quarkiverse/web/bundler/sass/SassBuildTimeCompiler.java b/sass-compiler/src/main/java/io/quarkiverse/web/bundler/sass/SassBuildTimeCompiler.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,4 @@ @@
           color: red;
         }
       }
-    }
+    }