Fix #8910: Optimize JS bundling (#8914)

primefaces · Jun 22, 2022 · 174bb78 · 174bb78
1 parent 883d9b3
commit 174bb78
Show file tree

Hide file tree

Showing 13 changed files with 3,405 additions and 9,818 deletions.
diff --git a/primefaces/pom.xml b/primefaces/pom.xml
@@ -554,6 +554,7 @@
                     <resourcesSets>
                         <resourcesSet>
                             <includes>
+                                <include>calendar/**</include>
                                 <include>charts/**</include>
                                 <include>clock/**</include>
                                 <include>colorpicker/**</include>
@@ -577,6 +578,7 @@
                                 <include>keyfilter/**</include>
                                 <include>knob/**</include>
                                 <include>lifecycle/**</include>
+                                <include>lightbox/**</include>
                                 <include>log/**</include>
                                 <include>mindmap/**</include>
                                 <include>organigram/**</include>
@@ -649,7 +651,6 @@
                                 <include>grid/grid.css</include>
                                 <include>growl/growl.css</include>
                                 <include>inplace/inplace.css</include>
-                                <include>lightbox/lightbox.css</include>
                                 <include>menu/menu.css</include>
                                 <include>messages/messages.css</include>
                                 <include>notificationbar/notificationbar.css</include>
@@ -717,7 +718,6 @@
                                 <include>accordion/accordion.js</include>
                                 <include>autocomplete/autocomplete.js</include>
                                 <include>blockui/blockui.js</include>
-                                <include>calendar/calendar.js</include>
                                 <include>carousel/carousel.js</include>
                                 <include>confirmpopup/confirmpopup.js</include>
                                 <include>columntoggler/columntoggler.js</include>
@@ -755,7 +755,6 @@
                                 <include>forms/forms.multiselectlistbox.js</include>
                                 <include>growl/growl.js</include>
                                 <include>inplace/inplace.js</include>
-                                <include>lightbox/lightbox.js</include>
                                 <include>menu/menu.base.js</include>
                                 <include>menu/menu.breadcrumb.js</include>
                                 <include>menu/menu.tieredmenu.js</include>
@@ -811,7 +810,6 @@
                         <resourcesSet>
                             <includes>
                                 <include>jquery/jquery.ui.js</include>
-                                <include>jquery/jquery.ui.timepicker.js</include>
                                 <include>jquery/jquery.caretposition.js</include>
                                 <include>jquery/jquery.autosize.js</include>
                                 <include>jquery/jquery.mousewheel.js</include>

diff --git a/primefaces/src/main/java/org/primefaces/component/calendar/Calendar.java b/primefaces/src/main/java/org/primefaces/component/calendar/Calendar.java
@@ -45,10 +45,10 @@
 
 @ResourceDependency(library = "primefaces", name = "components.css")
 @ResourceDependency(library = "primefaces", name = "jquery/jquery.js")
-@ResourceDependency(library = "primefaces", name = "jquery/jquery-plugins.js")
 @ResourceDependency(library = "primefaces", name = "core.js")
 @ResourceDependency(library = "primefaces", name = "inputmask/inputmask.js")
-@ResourceDependency(library = "primefaces", name = "components.js")
+@ResourceDependency(library = "primefaces", name = "calendar/calendar.css")
+@ResourceDependency(library = "primefaces", name = "calendar/calendar.js")
 public class Calendar extends CalendarBase {
 
     public static final String COMPONENT_TYPE = "org.primefaces.component.Calendar";

diff --git a/primefaces/src/main/java/org/primefaces/component/datatable/DataTable.java b/primefaces/src/main/java/org/primefaces/component/datatable/DataTable.java
@@ -61,8 +61,8 @@
 @ResourceDependency(library = "primefaces", name = "jquery/jquery.js")
 @ResourceDependency(library = "primefaces", name = "jquery/jquery-plugins.js")
 @ResourceDependency(library = "primefaces", name = "core.js")
-@ResourceDependency(library = "primefaces", name = "components.js")
 @ResourceDependency(library = "primefaces", name = "touch/touchswipe.js")
+@ResourceDependency(library = "primefaces", name = "components.js")
 public class DataTable extends DataTableBase {
 
     public static final String COMPONENT_TYPE = "org.primefaces.component.DataTable";

diff --git a/primefaces/src/main/java/org/primefaces/component/lightbox/LightBox.java b/primefaces/src/main/java/org/primefaces/component/lightbox/LightBox.java
@@ -32,7 +32,8 @@
 @ResourceDependency(library = "primefaces", name = "jquery/jquery.js")
 @ResourceDependency(library = "primefaces", name = "jquery/jquery-plugins.js")
 @ResourceDependency(library = "primefaces", name = "core.js")
-@ResourceDependency(library = "primefaces", name = "components.js")
+@ResourceDependency(library = "primefaces", name = "lightbox/lightbox.js")
+@ResourceDependency(library = "primefaces", name = "lightbox/lightbox.css")
 @Deprecated
 public class LightBox extends LightBoxBase {