From 63494ca870d7cb223f35a805b7184450d4d3bd75 Mon Sep 17 00:00:00 2001
From: Liu Xiao <42756849+liuxiaocs7@users.noreply.github.com>
Date: Sat, 24 Feb 2024 13:50:20 +0800
Subject: [PATCH] refactor(hubble): enhance maven front plugin (#568)

---
 .gitignore                              |  4 +++-
 hugegraph-hubble/hubble-dist/pom.xml    | 15 +++++++++------
 hugegraph-hubble/hubble-fe/package.json |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6909ee443..5e8ef4968 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,7 @@ build/
 /hubble-fe/node_modules
 /hubble-fe/.pnp
 .pnp.js
+/hugegraph-hubble/hubble-fe/node/node
 
 # testingå
 /hubble-fe/coverage
@@ -97,4 +98,5 @@ tree.txt
 Thumbs.db
 
 # client-go
-go.env
\ No newline at end of file
+go.env
+
diff --git a/hugegraph-hubble/hubble-dist/pom.xml b/hugegraph-hubble/hubble-dist/pom.xml
index 6b4e51eb1..75d2dc911 100644
--- a/hugegraph-hubble/hubble-dist/pom.xml
+++ b/hugegraph-hubble/hubble-dist/pom.xml
@@ -34,6 +34,8 @@
         <assembly.descriptor.dir>${assembly.dir}/descriptor</assembly.descriptor.dir>
         <assembly.static.dir>${assembly.dir}/static</assembly.static.dir>
         <hubble-fe.dir>${project.basedir}/../hubble-fe</hubble-fe.dir>
+        <build.node.version>v16.20.2</build.node.version>
+        <build.yarn.version>v1.22.21</build.yarn.version>
     </properties>
 
     <dependencies>
@@ -73,8 +75,8 @@
                 <version>1.14.2</version>
 
                 <configuration>
-                    <installDirectory>target</installDirectory>
-                    <workingDirectory>../hubble-fe</workingDirectory>
+                    <installDirectory>${hubble-fe.dir}</installDirectory>
+                    <workingDirectory>${hubble-fe.dir}</workingDirectory>
                 </configuration>
 
                 <executions>
@@ -82,12 +84,13 @@
                         <id>install node and yarn</id>
                         <goals>
                             <goal>install-node-and-yarn</goal>
-                            <goal>install-node-and-npm</goal>
                         </goals>
                         <configuration>
-                            <nodeVersion>v16.16.0</nodeVersion>
-                            <npmVersion>8.19.1</npmVersion>
-                            <yarnVersion>v1.22.15</yarnVersion>
+                            <nodeVersion>${build.node.version}</nodeVersion>
+                            <yarnVersion>${build.yarn.version}</yarnVersion>
+                            <nodeDownloadRoot>https://mirrors.aliyun.com/nodejs-release/</nodeDownloadRoot>
+                            <yarnDownloadRoot>https://repo.huaweicloud.com/yarn/</yarnDownloadRoot>
+                            <npmRegistryURL>https://registry.npmmirror.com</npmRegistryURL>
                         </configuration>
                     </execution>
 
diff --git a/hugegraph-hubble/hubble-fe/package.json b/hugegraph-hubble/hubble-fe/package.json
index 50ade67cd..711ca918e 100644
--- a/hugegraph-hubble/hubble-fe/package.json
+++ b/hugegraph-hubble/hubble-fe/package.json
@@ -49,7 +49,7 @@
   },
   "scripts": {
     "start": "react-app-rewired start",
-    "build": "CI=false && react-app-rewired build && npm run license",
+    "build": "CI=false && react-app-rewired build && yarn run license",
     "test": "react-app-rewired test",
     "license": "node add-license.js"
   },