Skip to content

Commit 67f2539

Browse files
authored
Configure helix-front Maven project to install yarn (#2145)
Configure helix-front Maven project to install yarn
1 parent 1a91797 commit 67f2539

File tree

5 files changed

+879
-1437
lines changed

5 files changed

+879
-1437
lines changed

helix-front/.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
registry=https://registry.npmjs.com/

helix-front/client/styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic');
44

55
// ngx-vis styles (vis styles)
6-
@import '~vis/dist/vis-network.min.css';
6+
@import '~vis-network/styles/vis-network.min.css';
77

88
// ngx-datatable styles
99
@import '~@swimlane/ngx-datatable/index.css';

helix-front/package.json

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"engines": {
2929
"node": "14.17.6",
30-
"yarn": "1.22.1"
30+
"yarn": "1.22.18"
3131
},
3232
"browserslist": [
3333
"last 2 Edge versions",
@@ -36,18 +36,18 @@
3636
"Chrome > 60"
3737
],
3838
"dependencies": {
39-
"@angular/animations": "13.3.9",
40-
"@angular/cdk": "13.3.7",
41-
"@angular/common": "13.3.9",
42-
"@angular/compiler": "13.3.9",
43-
"@angular/core": "13.3.9",
39+
"@angular/animations": "^13.3.9",
40+
"@angular/cdk": "^13.3.7",
41+
"@angular/common": "^13.3.9",
42+
"@angular/compiler": "^13.3.9",
43+
"@angular/core": "^13.3.9",
4444
"@angular/flex-layout": "^13.0.0-beta.38",
45-
"@angular/forms": "13.3.9",
45+
"@angular/forms": "^13.3.9",
4646
"@angular/material": "^13.3.7",
47-
"@angular/platform-browser": "13.3.9",
48-
"@angular/platform-browser-dynamic": "13.3.9",
49-
"@angular/platform-server": "13.3.9",
50-
"@angular/router": "13.3.9",
47+
"@angular/platform-browser": "^13.3.9",
48+
"@angular/platform-browser-dynamic": "^13.3.9",
49+
"@angular/platform-server": "^13.3.9",
50+
"@angular/router": "^13.3.9",
5151
"@egjs/hammerjs": "^2.0.17",
5252
"@swimlane/ngx-charts": "^16.0.0",
5353
"@swimlane/ngx-datatable": "^20.0.0",
@@ -78,7 +78,6 @@
7878
"tsickle": "github:angular/tsickle#8f11720637b7bb1c7b0e271e16bebbcdc8189617",
7979
"tslib": "^2.0.0",
8080
"uuid": "^7.0.3",
81-
"vis": "^4.21.0",
8281
"vis-data": "^6.5.1",
8382
"vis-util": "^4.0.0",
8483
"xss": "^1.0.11",

helix-front/pom.xml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<plugin>
5959
<groupId>com.github.eirslett</groupId>
6060
<artifactId>frontend-maven-plugin</artifactId>
61-
<version>0.0.22</version>
61+
<version>1.12.1</version>
6262

6363
<dependencies>
6464
<dependency>
@@ -70,20 +70,22 @@
7070

7171
<executions>
7272
<execution>
73-
<id>install node and npm</id>
73+
<id>install node and yarn</id>
74+
<phase>process-resources</phase>
7475
<goals>
75-
<goal>install-node-and-npm</goal>
76+
<goal>install-node-and-yarn</goal>
7677
</goals>
7778
<configuration>
78-
<nodeVersion>v8.11.1</nodeVersion>
79-
<npmVersion>5.8.0</npmVersion>
79+
<nodeVersion>v14.17.6</nodeVersion>
80+
<yarnVersion>v1.22.18</yarnVersion>
8081
</configuration>
8182
</execution>
8283

8384
<execution>
84-
<id>npm install</id>
85+
<id>yarn install</id>
86+
<phase>compile</phase>
8587
<goals>
86-
<goal>npm</goal>
88+
<goal>yarn</goal>
8789
</goals>
8890
<configuration>
8991
<arguments>install</arguments>
@@ -92,13 +94,13 @@
9294

9395
<execution>
9496
<id>build</id>
97+
<phase>process-test-resources</phase>
9598
<goals>
96-
<goal>npm</goal>
99+
<goal>yarn</goal>
97100
</goals>
98101
<configuration>
99-
<arguments>run-script build</arguments>
102+
<arguments>run build</arguments>
100103
</configuration>
101-
<phase>generate-resources</phase>
102104
</execution>
103105
</executions>
104106
</plugin>

0 commit comments

Comments
 (0)