646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
From ad687709cfca51603264ff565f296cfb5dceb15a Mon Sep 17 00:00:00 2001
|
|
From: Luke Bailey <baileylu@tcd.ie>
|
|
Date: Wed, 19 Mar 2025 22:25:44 +0000
|
|
Subject: [PATCH] Swap out frontend maven plugin which downloads npm
|
|
for fetching it through nix instead
|
|
|
|
---
|
|
web-bundle/pom.xml | 31 -------------------------------
|
|
1 file changed, 31 deletions(-)
|
|
|
|
diff --git a/web-bundle/pom.xml b/web-bundle/pom.xml
|
|
index 9a4d83b62..1d995cbaf 100644
|
|
--- a/web-bundle/pom.xml
|
|
+++ b/web-bundle/pom.xml
|
|
@@ -129,37 +129,6 @@
|
|
|
|
<build>
|
|
<plugins>
|
|
- <plugin>
|
|
- <groupId>com.github.eirslett</groupId>
|
|
- <artifactId>frontend-maven-plugin</artifactId>
|
|
- <version>1.12.1</version>
|
|
- <executions>
|
|
- <execution>
|
|
- <id>install node and npm</id>
|
|
- <goals>
|
|
- <goal>install-node-and-npm</goal>
|
|
- </goals>
|
|
- <configuration>
|
|
- <nodeVersion>v20.14.0</nodeVersion>
|
|
- <npmVersion>10.7.0</npmVersion>
|
|
- </configuration>
|
|
- </execution>
|
|
- <execution>
|
|
- <id>download graphhopper maps</id>
|
|
- <phase>generate-resources</phase>
|
|
- <goals>
|
|
- <goal>npm</goal>
|
|
- </goals>
|
|
- <configuration>
|
|
- <!--suppress UnresolvedMavenProperty (IntelliJ shows an error otherwise...)-->
|
|
- <arguments>
|
|
- pack --pack-destination=${basedir}/target
|
|
- @graphhopper/graphhopper-maps-bundle@${graphhopper-maps.version}
|
|
- </arguments>
|
|
- </configuration>
|
|
- </execution>
|
|
- </executions>
|
|
- </plugin>
|
|
<plugin>
|
|
<artifactId>maven-antrun-plugin</artifactId>
|
|
<executions>
|
|
--
|
|
2.48.1
|
|
|