atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kbh...@apache.org
Subject atlas git commit: ATLAS-2071 : UI : Minification of atlas code (js, css)
Date Mon, 28 Aug 2017 06:09:30 GMT
Repository: atlas
Updated Branches:
  refs/heads/master cba5f7622 -> a32e2b2e7


ATLAS-2071 : UI : Minification of atlas code (js,css)


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/a32e2b2e
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/a32e2b2e
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/a32e2b2e

Branch: refs/heads/master
Commit: a32e2b2e7f043740f2a282607ef356f8fea38bbf
Parents: cba5f76
Author: kevalbhatt <kbhatt@apache.org>
Authored: Thu Aug 24 17:54:46 2017 +0530
Committer: kevalbhatt <kbhatt@apache.org>
Committed: Mon Aug 28 11:37:56 2017 +0530

----------------------------------------------------------------------
 dashboardv2/gruntfile.js                    |  7 ++++---
 dashboardv2/pom.xml                         | 11 +----------
 docs/src/site/twiki/InstallationSteps.twiki | 10 ++++++++++
 pom.xml                                     |  7 +++++++
 4 files changed, 22 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/atlas/blob/a32e2b2e/dashboardv2/gruntfile.js
----------------------------------------------------------------------
diff --git a/dashboardv2/gruntfile.js b/dashboardv2/gruntfile.js
index 12af6fd..900ee40 100644
--- a/dashboardv2/gruntfile.js
+++ b/dashboardv2/gruntfile.js
@@ -224,6 +224,9 @@ module.exports = function(grunt) {
         },
         uglify: {
             build: {
+                options: {
+                    sourceMap: true
+                },
                 files: [{
                     expand: true,
                     cwd: 'dist/js',
@@ -307,7 +310,6 @@ module.exports = function(grunt) {
         'sass:dist',
         'uglify:build',
         'cssmin:build',
-        'htmlmin:build',
         'configureProxies:server',
         'connect:server',
         'watch'
@@ -321,7 +323,6 @@ module.exports = function(grunt) {
         'copy:build',
         'sass:build',
         'uglify:build',
-        'cssmin:build',
-        'htmlmin:build'
+        'cssmin:build'
     ]);
 };
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/atlas/blob/a32e2b2e/dashboardv2/pom.xml
----------------------------------------------------------------------
diff --git a/dashboardv2/pom.xml b/dashboardv2/pom.xml
index 20d58ad..634551d 100644
--- a/dashboardv2/pom.xml
+++ b/dashboardv2/pom.xml
@@ -108,21 +108,12 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>npm remaining</id>
-                        <goals>
-                            <goal>npm</goal>
-                        </goals>
-                        <configuration>
-                            <arguments>install --ignore-scripts</arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
                         <id>grunt dist</id>
                         <goals>
                             <goal>grunt</goal>
                         </goals>
                         <configuration>
-                            <arguments>build</arguments>
+                            <arguments>${project.build.dashboardv2.gruntBuild}</arguments>
                         </configuration>
                     </execution>
                 </executions>

http://git-wip-us.apache.org/repos/asf/atlas/blob/a32e2b2e/docs/src/site/twiki/InstallationSteps.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki
index 0934495..417df11 100644
--- a/docs/src/site/twiki/InstallationSteps.twiki
+++ b/docs/src/site/twiki/InstallationSteps.twiki
@@ -121,6 +121,16 @@ Also, a standalone instance of Solr can be started as the default search
indexin
 indexing for a different Solr instance please see "Graph Search Index - Solr" in the
 [[Configuration][Configuration]] section.
 
+To build a distribution without minified js,css file, build with the skipMinify profile.
+
+<verbatim>
+
+mvn clean package -Pdist,skipMinify
+
+</verbatim>
+
+Note that by default js and css files are minified.
+
 ---+++ Installing & Running Atlas
 
 ---++++ Installing Atlas

http://git-wip-us.apache.org/repos/asf/atlas/blob/a32e2b2e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8d62786..157122a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -588,6 +588,7 @@
         <atlas.surefire.options></atlas.surefire.options>
 
         <aspectj.runtime.version>1.8.7</aspectj.runtime.version>
+        <project.build.dashboardv2.gruntBuild>build-minify</project.build.dashboardv2.gruntBuild>
     </properties>
 
     <profiles>
@@ -639,6 +640,12 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
+        <profile>
+            <id>skipMinify</id>
+            <properties>
+                <project.build.dashboardv2.gruntBuild>build</project.build.dashboardv2.gruntBuild>
+            </properties>
+        </profile>
     </profiles>
 
     <modules>


Mime
View raw message