Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(hubble): enhance maven front plugin #568

Merged
merged 5 commits into from
Feb 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ build/
/hubble-fe/node_modules
/hubble-fe/.pnp
.pnp.js
/hugegraph-hubble/hubble-fe/node/node

# testingå
/hubble-fe/coverage
Expand Down Expand Up @@ -97,4 +98,5 @@ tree.txt
Thumbs.db

# client-go
go.env
go.env

15 changes: 9 additions & 6 deletions hugegraph-hubble/hubble-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -73,21 +75,22 @@
<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>
<execution>
<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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could we use the same mirror url from taobao?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done~

Copy link
Member Author

@liuxiaocs7 liuxiaocs7 Jan 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems not now, The download address is automatically spliced based on url and version

prefix/{version}/yarn-{version}.tar.gz

Optional download address:

https://repo.huaweicloud.com/yarn/v1.22.21/yarn-v1.22.21.tar.gz        √

https://registry.npmmirror.com/yarn/-/yarn-1.22.21.tgz                 ×

but we can not download file from this url below.

https://registry.npmmirror.com/yarn/v1.22.21/yarn-v1.22.21.tar.gz

ref: eirslett/frontend-maven-plugin#601

Copy link
Member

@imbajin imbajin Feb 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: Skip it now & replace it(the mirror address) in future

<npmRegistryURL>https://registry.npmmirror.com</npmRegistryURL>
</configuration>
</execution>

Expand Down
2 changes: 1 addition & 1 deletion hugegraph-hubble/hubble-fe/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
Loading