Merge branch 'main' into feat/2405/Add-way-to-disable-progress-indicator

vaadin · Feb 13, 2025 · e18fc58 · e18fc58
2 parents c13cbec + db1aee2
commit e18fc58
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/packages/java/engine-core/src/main/java/com/vaadin/hilla/engine/GeneratorConfiguration.java b/packages/java/engine-core/src/main/java/com/vaadin/hilla/engine/GeneratorConfiguration.java
@@ -138,6 +138,7 @@ public boolean shouldAllDefaultsBeDisabled() {
 
     static class PluginsProcessor extends ConfigList.Processor<Plugin> {
         static private final List<Plugin> DEFAULTS = List.of(
+                new Plugin("@vaadin/hilla-generator-plugin-transfertypes"),
                 new Plugin("@vaadin/hilla-generator-plugin-backbone"),
                 new Plugin("@vaadin/hilla-generator-plugin-client"),
                 new Plugin("@vaadin/hilla-generator-plugin-barrel"),

diff --git a/packages/ts/generator-core/src/PluginManager.ts b/packages/ts/generator-core/src/PluginManager.ts
@@ -9,7 +9,7 @@ export default class PluginManager {
 
   constructor(plugins: readonly PluginConstructor[], resolver: ReferenceResolver, logger: LoggerFactory) {
     const standardPlugins = [
-      'TransferTypesPlugin', // should go before Backbone Plugin
+      'TransferTypesPlugin',
       'BackbonePlugin',
       'ClientPlugin',
       'BarrelPlugin',