Migrate jquery to version 3.7.0

supplyon · Jul 25, 2023 · 8c4f141 · 8c4f141
1 parent bffa6d9
commit 8c4f141
Show file tree

Hide file tree

Showing 6 changed files with 10,827 additions and 3,519 deletions.
diff --git a/framework/impl/generatescript.xml → framework/impl/assemble-scripts.xml b/framework/impl/generatescript.xml → framework/impl/assemble-scripts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<project name="assemblescripts" default="assembly">
-    <description>Concat JavaScript files</description>
+<project name="assemble-scripts" default="assemble">
+    <description>Assemble JavaScript files</description>
 
     <property name="target.dir" value="${project.build.directory}/javascript"></property>
     <property name="source.dir" value="${basedir}/src/main/java"></property>
@@ -11,15 +11,26 @@
         dir="${basedir}/src/main/java/${richfaces.scripts.path}/scriptaculous"
         files="builder.js,effects.js,dragdrop.js,controls.js,slider.js,sound.js">
     </filelist>
+    <filelist id="jquery"
+        dir="${basedir}/src/main/java/${richfaces.scripts.path}/jquery"
+        files="jquery-3.7.0-patched.js,jquery.richfaces.js">
+    </filelist>
 
-    <target name="assembly" depends="depends" description="Concat JavaScripts files">
+    <target name="assemble" depends="depends" description="Concat JavaScripts files">
         <concat append="false"
             binary="false"
             destfile="${target.dir}/${richfaces.scripts.path}/scriptaculous/scriptaculous.js"
             fixlastline="yes"
             eol="unix">
             <filelist refid="scriptaculous"></filelist>
         </concat>
+        <concat append="false"
+            binary="false"
+            destfile="${target.dir}/${richfaces.scripts.path}/jquery/jquery.js"
+            fixlastline="yes"
+            eol="unix">
+            <filelist refid="jquery"></filelist>
+        </concat>
         <copy todir="${target.dir}/${ajax4jsf.scripts.path}">
             <fileset dir="${source.dir}/${ajax4jsf.scripts.path}" includes="**/*.js"/>
         </copy>

diff --git a/framework/impl/pom.xml b/framework/impl/pom.xml
@@ -82,8 +82,8 @@
             </goals>
             <configuration>
               <tasks>
-                <ant antfile="${basedir}/generatescript.xml" inheritRefs="true">
-                  <target name="assembly"></target>
+                <ant antfile="${basedir}/assemble-scripts.xml" inheritRefs="true">
+                  <target name="assemble"></target>
                   <property name="target-dir" value="${project.build.directory}/javascript"></property>
                 </ant>
               </tasks>
@@ -110,6 +110,8 @@
             </goals>
             <configuration>
               <nosuffix>false</nosuffix>
+              <!-- Uncomment to disable minification -->
+              <!-- <nomunge>true</nomunge> -->
               <outputDirectory>${project.build.directory}/compressed/</outputDirectory>
               <aggregations>
                 <aggregation>
@@ -142,6 +144,7 @@
                   <excludes>
                     <exclude>**/*.pack.js</exclude>
                     <exclude>**/scriptaculous/*.js</exclude>
+                    <exclude>**/jquery/*.js</exclude>
                     <exclude>**/extend-min.js</exclude>
                     <exclude>**/jquery.jcarousel-min.js</exclude>
                     <exclude>**/compressed.css</exclude>