[MNT-23888] Changes done for handling reserved words while compressing the javascript files.

This commit is contained in:
atkumar
2023-10-17 11:42:45 +05:30
parent 20d4486da9
commit 1cae6a854f
3 changed files with 81 additions and 40 deletions

View File

@@ -289,49 +289,63 @@
<!-- Compress JavaScript files and store as *-min.js --> <!-- Compress JavaScript files and store as *-min.js -->
<plugin> <plugin>
<groupId>net.alchim31.maven</groupId> <groupId>com.github.blutorange</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId> <artifactId>closure-compiler-maven-plugin</artifactId>
<version>1.5.1</version> <version>2.28.0</version>
<executions> <executions>
<!-- Compress the JS files under the assembly folder --> <!-- Compress the JS files under the assembly folder -->
<execution> <execution>
<id>compress-assembly</id> <id>compress-assembly</id>
<phase>generate-resources</phase>
<goals> <goals>
<goal>compress</goal> <goal>minify</goal>
</goals> </goals>
<configuration> <configuration>
<sourceDirectory>${project.basedir}/src/main/assembly/web</sourceDirectory> <baseSourceDir>${project.basedir}/src/main/assembly</baseSourceDir>
<outputDirectory>${project.basedir}/src/main/assembly/web</outputDirectory> <baseTargetDir>${project.basedir}/src/main/assembly</baseTargetDir>
<sourceDir>web</sourceDir>
<targetDir>web</targetDir>
<skipMerge>true</skipMerge>
<includes>
<include>**/*.js</include>
</includes>
<excludes> <excludes>
<exclude>**/webscripts/**</exclude> <exclude>**/webscripts/**</exclude>
<exclude>**/site-webscripts/**</exclude> <exclude>**/site-webscripts/**</exclude>
<exclude>**/META-INF/**</exclude> <exclude>**/META-INF/**</exclude>
<exclude>**/*.lib.js</exclude> <exclude>**/*.lib.js</exclude>
<exclude>**/*.css</exclude> <exclude>**/*.css</exclude>
<exclude>**/*-min.js</exclude> <exclude>**/*.min.js</exclude>
<exclude>**/*-min.css</exclude> <exclude>**/*.min.css</exclude>
</excludes> </excludes>
<force>true</force> <force>true</force>
<jswarn>false</jswarn>
</configuration> </configuration>
</execution> </execution>
<!-- Compress the JS files under the resources folder --> <!-- Compress the JS files under the resources folder -->
<execution> <execution>
<id>compress-resources</id> <id>compress-resources</id>
<phase>generate-resources</phase>
<goals> <goals>
<goal>compress</goal> <goal>minify</goal>
</goals> </goals>
<configuration> <configuration>
<baseSourceDir>${project.basedir}/src/main</baseSourceDir>
<baseTargetDir>${project.basedir}/src/main</baseTargetDir>
<sourceDir>resources</sourceDir>
<targetDir>resources</targetDir>
<skipMerge>true</skipMerge>
<includes>
<include>**/*.js</include>
</includes>
<excludes> <excludes>
<exclude>**/webscripts/**</exclude> <exclude>**/webscripts/**</exclude>
<exclude>**/site-webscripts/**</exclude> <exclude>**/site-webscripts/**</exclude>
<exclude>**/*.lib.js</exclude> <exclude>**/*.lib.js</exclude>
<exclude>**/*.css</exclude> <exclude>**/*.css</exclude>
<exclude>**/*-min.js</exclude> <exclude>**/*.min.js</exclude>
<exclude>**/*-min.css</exclude> <exclude>**/*.min.css</exclude>
</excludes> </excludes>
<force>true</force> <force>true</force>
<jswarn>false</jswarn>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

View File

@@ -357,54 +357,67 @@
<!-- Compress JavaScript files and store as *-min.js --> <!-- Compress JavaScript files and store as *-min.js -->
<plugin> <plugin>
<groupId>net.alchim31.maven</groupId> <groupId>com.github.blutorange</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId> <artifactId>closure-compiler-maven-plugin</artifactId>
<version>1.5.1</version> <version>2.28.0</version>
<executions> <executions>
<!-- Compress the JS files under the assembly folder --> <!-- Compress the JS files under the assembly folder -->
<execution> <execution>
<id>compress-assembly</id> <id>compress-assembly</id>
<phase>generate-resources</phase>
<goals> <goals>
<goal>compress</goal> <goal>minify</goal>
</goals> </goals>
<configuration> <configuration>
<sourceDirectory>${project.basedir}/src/main/assembly/web</sourceDirectory> <baseSourceDir>${project.basedir}/src/main/assembly</baseSourceDir>
<outputDirectory>${project.basedir}/src/main/assembly/web</outputDirectory> <baseTargetDir>${project.basedir}/src/main/assembly</baseTargetDir>
<sourceDir>web</sourceDir>
<targetDir>web</targetDir>
<skipMerge>true</skipMerge>
<includes>
<include>**/*.js</include>
</includes>
<excludes> <excludes>
<exclude>**/webscripts/**</exclude> <exclude>**/webscripts/**</exclude>
<exclude>**/site-webscripts/**</exclude> <exclude>**/site-webscripts/**</exclude>
<exclude>**/META-INF/**</exclude> <exclude>**/META-INF/**</exclude>
<exclude>**/*.lib.js</exclude> <exclude>**/*.lib.js</exclude>
<exclude>**/*.css</exclude> <exclude>**/*.css</exclude>
<exclude>**/*-min.js</exclude> <exclude>**/*.min.js</exclude>
<exclude>**/*-min.css</exclude> <exclude>**/*.min.css</exclude>
</excludes> </excludes>
<force>true</force> <force>true</force>
<jswarn>false</jswarn>
</configuration> </configuration>
</execution> </execution>
<!-- Compress the JS files under the resources folder --> <!-- Compress the JS files under the resources folder -->
<execution> <execution>
<id>compress-resources</id> <id>compress-resources</id>
<phase>generate-resources</phase>
<goals> <goals>
<goal>compress</goal> <goal>minify</goal>
</goals> </goals>
<configuration> <configuration>
<baseSourceDir>${project.basedir}/src/main</baseSourceDir>
<baseTargetDir>${project.basedir}/src/main</baseTargetDir>
<sourceDir>resources</sourceDir>
<targetDir>resources</targetDir>
<skipMerge>true</skipMerge>
<includes>
<include>**/*.js</include>
</includes>
<excludes> <excludes>
<exclude>**/webscripts/**</exclude> <exclude>**/webscripts/**</exclude>
<exclude>**/site-webscripts/**</exclude> <exclude>**/site-webscripts/**</exclude>
<exclude>**/*.lib.js</exclude> <exclude>**/*.lib.js</exclude>
<exclude>**/*.css</exclude> <exclude>**/*.css</exclude>
<exclude>**/*-min.js</exclude> <exclude>**/*.min.js</exclude>
<exclude>**/*-min.css</exclude> <exclude>**/*.min.css</exclude>
</excludes> </excludes>
<force>true</force> <force>true</force>
<jswarn>false</jswarn>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- Hot reloading with JRebel --> <!-- Hot reloading with JRebel -->
<plugin> <plugin>
<groupId>org.zeroturnaround</groupId> <groupId>org.zeroturnaround</groupId>

View File

@@ -223,49 +223,63 @@
<!-- Compress JavaScript files and store as *-min.js --> <!-- Compress JavaScript files and store as *-min.js -->
<plugin> <plugin>
<groupId>net.alchim31.maven</groupId> <groupId>com.github.blutorange</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId> <artifactId>closure-compiler-maven-plugin</artifactId>
<version>1.5.1</version> <version>2.28.0</version>
<executions> <executions>
<!-- Compress the JS files under the assembly folder --> <!-- Compress the JS files under the assembly folder -->
<execution> <execution>
<id>compress-assembly</id> <id>compress-assembly</id>
<phase>generate-resources</phase>
<goals> <goals>
<goal>compress</goal> <goal>minify</goal>
</goals> </goals>
<configuration> <configuration>
<sourceDirectory>${project.basedir}/src/main/assembly/web</sourceDirectory> <baseSourceDir>${project.basedir}/src/main/assembly</baseSourceDir>
<outputDirectory>${project.basedir}/src/main/assembly/web</outputDirectory> <baseTargetDir>${project.basedir}/src/main/assembly</baseTargetDir>
<sourceDir>web</sourceDir>
<targetDir>web</targetDir>
<skipMerge>true</skipMerge>
<includes>
<include>**/*.js</include>
</includes>
<excludes> <excludes>
<exclude>**/webscripts/**</exclude> <exclude>**/webscripts/**</exclude>
<exclude>**/site-webscripts/**</exclude> <exclude>**/site-webscripts/**</exclude>
<exclude>**/META-INF/**</exclude> <exclude>**/META-INF/**</exclude>
<exclude>**/*.lib.js</exclude> <exclude>**/*.lib.js</exclude>
<exclude>**/*.css</exclude> <exclude>**/*.css</exclude>
<exclude>**/*-min.js</exclude> <exclude>**/*.min.js</exclude>
<exclude>**/*-min.css</exclude> <exclude>**/*.min.css</exclude>
</excludes> </excludes>
<force>true</force> <force>true</force>
<jswarn>false</jswarn>
</configuration> </configuration>
</execution> </execution>
<!-- Compress the JS files under the resources folder --> <!-- Compress the JS files under the resources folder -->
<execution> <execution>
<id>compress-resources</id> <id>compress-resources</id>
<phase>generate-resources</phase>
<goals> <goals>
<goal>compress</goal> <goal>minify</goal>
</goals> </goals>
<configuration> <configuration>
<baseSourceDir>${project.basedir}/src/main</baseSourceDir>
<baseTargetDir>${project.basedir}/src/main</baseTargetDir>
<sourceDir>resources</sourceDir>
<targetDir>resources</targetDir>
<skipMerge>true</skipMerge>
<includes>
<include>**/*.js</include>
</includes>
<excludes> <excludes>
<exclude>**/webscripts/**</exclude> <exclude>**/webscripts/**</exclude>
<exclude>**/site-webscripts/**</exclude> <exclude>**/site-webscripts/**</exclude>
<exclude>**/*.lib.js</exclude> <exclude>**/*.lib.js</exclude>
<exclude>**/*.css</exclude> <exclude>**/*.css</exclude>
<exclude>**/*-min.js</exclude> <exclude>**/*.min.js</exclude>
<exclude>**/*-min.css</exclude> <exclude>**/*.min.css</exclude>
</excludes> </excludes>
<force>true</force> <force>true</force>
<jswarn>false</jswarn>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>