Configure helix-front Maven project to install yarn (#2145)

Configure helix-front Maven project to install yarn
apache · Jun 9, 2022 · 67f2539 · 67f2539
1 parent 1a91797
commit 67f2539
Show file tree

Hide file tree

Showing 5 changed files with 879 additions and 1,437 deletions.
diff --git a/helix-front/.npmrc b/helix-front/.npmrc
@@ -0,0 +1 @@
+registry=https://registry.npmjs.com/
diff --git a/helix-front/client/styles.scss b/helix-front/client/styles.scss
@@ -3,7 +3,7 @@
 @import url('https://fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic');
 
 // ngx-vis styles (vis styles)
-@import '~vis/dist/vis-network.min.css';
+@import '~vis-network/styles/vis-network.min.css';
 
 // ngx-datatable styles
 @import '~@swimlane/ngx-datatable/index.css';

diff --git a/helix-front/package.json b/helix-front/package.json
@@ -27,7 +27,7 @@
   },
   "engines": {
     "node": "14.17.6",
-    "yarn": "1.22.1"
+    "yarn": "1.22.18"
   },
   "browserslist": [
     "last 2 Edge versions",
@@ -36,18 +36,18 @@
     "Chrome > 60"
   ],
   "dependencies": {
-    "@angular/animations": "13.3.9",
-    "@angular/cdk": "13.3.7",
-    "@angular/common": "13.3.9",
-    "@angular/compiler": "13.3.9",
-    "@angular/core": "13.3.9",
+    "@angular/animations": "^13.3.9",
+    "@angular/cdk": "^13.3.7",
+    "@angular/common": "^13.3.9",
+    "@angular/compiler": "^13.3.9",
+    "@angular/core": "^13.3.9",
     "@angular/flex-layout": "^13.0.0-beta.38",
-    "@angular/forms": "13.3.9",
+    "@angular/forms": "^13.3.9",
     "@angular/material": "^13.3.7",
-    "@angular/platform-browser": "13.3.9",
-    "@angular/platform-browser-dynamic": "13.3.9",
-    "@angular/platform-server": "13.3.9",
-    "@angular/router": "13.3.9",
+    "@angular/platform-browser": "^13.3.9",
+    "@angular/platform-browser-dynamic": "^13.3.9",
+    "@angular/platform-server": "^13.3.9",
+    "@angular/router": "^13.3.9",
     "@egjs/hammerjs": "^2.0.17",
     "@swimlane/ngx-charts": "^16.0.0",
     "@swimlane/ngx-datatable": "^20.0.0",
@@ -78,7 +78,6 @@
     "tsickle": "github:angular/tsickle#8f11720637b7bb1c7b0e271e16bebbcdc8189617",
     "tslib": "^2.0.0",
     "uuid": "^7.0.3",
-    "vis": "^4.21.0",
     "vis-data": "^6.5.1",
     "vis-util": "^4.0.0",
     "xss": "^1.0.11",

diff --git a/helix-front/pom.xml b/helix-front/pom.xml
@@ -58,7 +58,7 @@
       <plugin>
         <groupId>com.github.eirslett</groupId>
         <artifactId>frontend-maven-plugin</artifactId>
-        <version>0.0.22</version>
+        <version>1.12.1</version>
 
         <dependencies>
           <dependency>
@@ -70,20 +70,22 @@
 
         <executions>
           <execution>
-            <id>install node and npm</id>
+            <id>install node and yarn</id>
+            <phase>process-resources</phase>
             <goals>
-              <goal>install-node-and-npm</goal>
+              <goal>install-node-and-yarn</goal>
             </goals>
             <configuration>
-              <nodeVersion>v8.11.1</nodeVersion>
-              <npmVersion>5.8.0</npmVersion>
+              <nodeVersion>v14.17.6</nodeVersion>
+              <yarnVersion>v1.22.18</yarnVersion>
             </configuration>
           </execution>
 
           <execution>
-            <id>npm install</id>
+            <id>yarn install</id>
+            <phase>compile</phase>
             <goals>
-              <goal>npm</goal>
+              <goal>yarn</goal>
             </goals>
             <configuration>
               <arguments>install</arguments>
@@ -92,13 +94,13 @@
 
           <execution>
             <id>build</id>
+            <phase>process-test-resources</phase>
             <goals>
-              <goal>npm</goal>
+              <goal>yarn</goal>
             </goals>
             <configuration>
-              <arguments>run-script build</arguments>
+              <arguments>run build</arguments>
             </configuration>
-            <phase>generate-resources</phase>
           </execution>
         </executions>
       </plugin>