Merge pull request #199 from grails/197-assets-from-plugin-are-not-pa…

…ckaged-by-default-need-to-add-packageplugin-=-true-in-buildgradle-file For WEB_PLUGIN set packagePlugin prop
grails · Sep 23, 2023 · a17427f · a17427f
2 parents 9ecdc55 + 52034c8
commit a17427f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/assetPipeline/AssetPipeline.java b/grails-forge-core/src/main/java/org/grails/forge/feature/assetPipeline/AssetPipeline.java
@@ -66,7 +66,7 @@ public void apply(GeneratorContext generatorContext) {
                 .buildscript());
         generatorContext.addBuildPlugin(GradlePlugin.builder()
                 .id("com.bertramlabs.asset-pipeline")
-                .extension(new RockerWritable(assetPipelineExtension.template()))
+                .extension(new RockerWritable(assetPipelineExtension.template(generatorContext.getApplicationType())))
                 .build());
 
         generatorContext.addDependency(Dependency.builder()

diff --git a/...n/java/org/grails/forge/feature/assetPipeline/templates/assetPipelineExtension.rocker.raw b/...n/java/org/grails/forge/feature/assetPipeline/templates/assetPipelineExtension.rocker.raw
@@ -1,5 +1,13 @@
+@import org.grails.forge.application.ApplicationType
+
+@args (
+    org.grails.forge.application.ApplicationType applicationType
+)
 
 assets {
+@if (applicationType == ApplicationType.WEB_PLUGIN) {
+    packagePlugin = true
+}
     minifyJs = true
     minifyCss = true
 }
diff --git a/...orge-core/src/test/groovy/org/grails/forge/feature/assetPipeline/AssetPipelineSpec.groovy b/...orge-core/src/test/groovy/org/grails/forge/feature/assetPipeline/AssetPipelineSpec.groovy
@@ -48,6 +48,24 @@ assets {
 }''')
     }
 
+    void "test extension packagePlugin is set for application #applicationType"() {
+        when:
+        final String template = new BuildBuilder(beanContext)
+                .applicationType(applicationType)
+                .features(["asset-pipeline-grails"])
+                .render()
+
+        then:
+        template.contains('''
+assets {
+    packagePlugin = true
+    minifyJs = true
+    minifyCss = true
+}''')
+        where:
+        applicationType << [ApplicationType.WEB_PLUGIN]
+    }
+
     void "test assets files are present"() {
         given:
         final Map<String, String> output = generate(ApplicationType.WEB, new Options(TestFramework.SPOCK, JdkVersion.JDK_11))