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

Bump react-scripts and @craco/craco in /frontend #61

Open
wants to merge 76 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
c23c70e
Bump async from 2.6.3 to 2.6.4 in /frontend (#1)
dependabot[bot] Aug 21, 2022
d3ab096
Bump minimist from 1.2.5 to 1.2.6 in /frontend (#2)
dependabot[bot] Aug 21, 2022
2abbbde
Bump eventsource from 1.1.0 to 1.1.2 in /frontend (#3)
dependabot[bot] Aug 21, 2022
0737f26
Bump terser from 4.8.0 to 4.8.1 in /frontend (#4)
dependabot[bot] Aug 21, 2022
2a49f29
Bump guava from 31.0.1-jre to 31.1-jre (#6)
dependabot[bot] Aug 21, 2022
c6a5268
Bump exec-maven-plugin from 3.0.0 to 3.1.0 (#9)
dependabot[bot] Aug 21, 2022
c29e5ce
Bump drasyl-node from 0.7.0 to 0.8.0 (#8)
dependabot[bot] Aug 21, 2022
2a0aa6c
Bump geoip2 from 3.0.0 to 3.0.1 (#7)
dependabot[bot] Aug 21, 2022
632063d
Bump url-parse from 1.5.3 to 1.5.10 in /frontend (#12)
dependabot[bot] Aug 21, 2022
4314c5d
Bump spring.version from 2.6.4 to 2.7.3 (#5)
dependabot[bot] Aug 21, 2022
dab09d7
Bump junit-jupiter from 5.8.2 to 5.9.0 (#13)
dependabot[bot] Aug 21, 2022
00d42a3
Bump maven-assembly-plugin from 3.3.0 to 3.4.2 (#14)
dependabot[bot] Aug 21, 2022
c9127bd
Bump nanoid from 3.1.30 to 3.3.4 in /frontend (#11)
dependabot[bot] Aug 21, 2022
0e9b05a
Bump typescript from 4.4.4 to 4.7.4 in /frontend (#18)
dependabot[bot] Aug 21, 2022
95cffa9
Bump follow-redirects from 1.14.4 to 1.15.1 in /frontend (#16)
dependabot[bot] Aug 21, 2022
e6a3839
Bump @types/jest from 26.0.24 to 28.1.7 in /frontend (#17)
dependabot[bot] Aug 21, 2022
2b888a8
use more pregnant placeholder value
HeikoBornholdt Aug 22, 2022
1e4146d
[ImgBot] Optimize images (#22)
imgbot[bot] Aug 22, 2022
42001a1
Bump postcss from 7.0.39 to 8.4.16 in /frontend (#15)
dependabot[bot] Aug 22, 2022
442ffae
Bump @testing-library/jest-dom from 5.14.1 to 5.16.5 in /frontend (#19)
dependabot[bot] Aug 22, 2022
9a9e981
Bump @types/node from 12.20.36 to 18.7.9 in /frontend (#20)
dependabot[bot] Aug 22, 2022
7c94302
Bump @testing-library/user-event from 12.8.3 to 14.4.3 in /frontend (…
dependabot[bot] Aug 22, 2022
d18e84a
Bump @testing-library/react from 11.2.7 to 12.1.5 in /frontend (#10)
dependabot[bot] Aug 22, 2022
16c9d27
Bump typescript from 4.7.4 to 4.8.2 in /frontend (#25)
dependabot[bot] Aug 29, 2022
346ea02
Bump @types/node from 18.7.9 to 18.7.13 in /frontend (#26)
dependabot[bot] Aug 29, 2022
0b2b40f
Bump @craco/craco from 6.4.0 to 6.4.5 in /frontend (#29)
dependabot[bot] Aug 29, 2022
0cd2b19
Bump @types/jest from 28.1.7 to 28.1.8 in /frontend (#28)
dependabot[bot] Aug 29, 2022
5b35cf8
Bump web-vitals from 1.1.2 to 3.0.0 in /frontend (#27)
dependabot[bot] Aug 29, 2022
b822df4
Bump web-vitals from 3.0.0 to 3.0.1 in /frontend (#31)
dependabot[bot] Sep 5, 2022
5ae9020
Bump @types/node from 18.7.13 to 18.7.15 in /frontend (#30)
dependabot[bot] Sep 5, 2022
269aa0a
Bump react-map-gl from 5.3.17 to 6.1.19 in /frontend (#32)
dependabot[bot] Sep 5, 2022
933d766
Bump @types/jest from 28.1.8 to 29.0.1 in /frontend (#33)
dependabot[bot] Sep 12, 2022
6ec7906
Bump typescript from 4.8.2 to 4.8.3 in /frontend (#34)
dependabot[bot] Sep 12, 2022
8985b02
Bump @types/node from 18.7.15 to 18.7.16 in /frontend (#35)
dependabot[bot] Sep 12, 2022
31bffce
Bump web-vitals from 3.0.1 to 3.0.2 in /frontend (#38)
dependabot[bot] Sep 19, 2022
5f09a00
Bump @types/node from 18.7.16 to 18.7.18 in /frontend (#37)
dependabot[bot] Sep 19, 2022
6bdfdf7
Bump @types/jest from 29.0.1 to 29.0.3 in /frontend (#36)
dependabot[bot] Sep 19, 2022
79ae068
Bump junit-jupiter from 5.9.0 to 5.9.1 (#40)
dependabot[bot] Sep 26, 2022
3d01e95
Bump spring.version from 2.7.3 to 2.7.4 (#39)
dependabot[bot] Sep 26, 2022
a06504e
Bump @types/node from 18.7.18 to 18.7.21 in /frontend (#41)
dependabot[bot] Sep 26, 2022
25152c8
Bump drasyl-node from 0.8.0 to 0.9.0 (#42)
dependabot[bot] Oct 3, 2022
b698b8b
Bump @types/jest from 29.0.3 to 29.1.1 in /frontend (#45)
dependabot[bot] Oct 3, 2022
8ab11d5
Bump postcss from 8.4.16 to 8.4.17 in /frontend (#44)
dependabot[bot] Oct 3, 2022
e49b946
Bump typescript from 4.8.3 to 4.8.4 in /frontend (#46)
dependabot[bot] Oct 3, 2022
dd178eb
Bump @types/node from 18.7.21 to 18.8.0 in /frontend (#43)
dependabot[bot] Oct 3, 2022
8018bb5
Bump @types/jest from 29.1.1 to 29.1.2 in /frontend (#49)
dependabot[bot] Oct 10, 2022
cc0e4e2
Bump web-vitals from 3.0.2 to 3.0.3 in /frontend (#48)
dependabot[bot] Oct 10, 2022
7478739
Bump @types/node from 18.8.0 to 18.8.3 in /frontend (#47)
dependabot[bot] Oct 10, 2022
43003d2
Bump @types/node from 18.8.3 to 18.11.0 in /frontend (#50)
dependabot[bot] Oct 17, 2022
25ad571
Bump postcss from 8.4.17 to 8.4.18 in /frontend (#51)
dependabot[bot] Oct 17, 2022
4033918
Bump web-vitals from 3.0.3 to 3.0.4 in /frontend (#55)
dependabot[bot] Oct 24, 2022
9ac01bb
Bump @types/node from 18.11.0 to 18.11.4 in /frontend (#54)
dependabot[bot] Oct 24, 2022
942c268
Bump spring.version from 2.7.4 to 2.7.5 (#52)
dependabot[bot] Oct 24, 2022
de03934
Bump @types/jest from 29.1.2 to 29.2.0 in /frontend (#53)
dependabot[bot] Oct 24, 2022
f617aaf
Bump @types/node from 18.11.4 to 18.11.8 in /frontend (#56)
dependabot[bot] Oct 31, 2022
53e112a
Bump @types/node from 18.11.8 to 18.11.9 in /frontend (#59)
dependabot[bot] Nov 7, 2022
86cadea
Bump geoip2 from 3.0.1 to 3.0.2 (#57)
dependabot[bot] Nov 7, 2022
b11e5d0
Bump @types/jest from 29.2.0 to 29.2.2 in /frontend (#58)
dependabot[bot] Nov 7, 2022
f11fac6
Bump postcss from 8.4.18 to 8.4.19 in /frontend (#60)
dependabot[bot] Nov 14, 2022
46ea2df
Bump @types/jest from 29.2.2 to 29.2.3 in /frontend (#62)
dependabot[bot] Nov 21, 2022
54c703d
Bump web-vitals from 3.0.4 to 3.1.0 in /frontend (#63)
dependabot[bot] Nov 21, 2022
273dfb0
Bump react-map-gl from 6.1.19 to 6.1.20 in /frontend (#66)
dependabot[bot] Nov 28, 2022
e3788c1
Bump typescript from 4.8.4 to 4.9.3 in /frontend (#65)
dependabot[bot] Nov 28, 2022
3b87740
more logging
HeikoBornholdt Dec 3, 2022
2e170a4
Bump @types/node from 18.11.9 to 18.11.10 in /frontend (#67)
dependabot[bot] Dec 5, 2022
474af13
Bump decode-uri-component from 0.2.0 to 0.2.2 in /frontend (#68)
dependabot[bot] Dec 5, 2022
2131ec5
Bump @types/jest from 29.2.3 to 29.2.4 in /frontend (#69)
dependabot[bot] Dec 5, 2022
b05e700
Update IpLocations.java
HeikoBornholdt Dec 9, 2022
8463cac
Update IpLocations.java
HeikoBornholdt Dec 11, 2022
44fe25f
Bump json5 from 1.0.1 to 1.0.2 in /frontend (#75)
dependabot[bot] Jan 8, 2023
c60dad2
Bump postcss from 8.4.19 to 8.4.21 in /frontend (#76)
dependabot[bot] Jan 9, 2023
0719335
Update index.html
HeikoBornholdt Jan 12, 2023
a6e811b
Bump junit-jupiter from 5.9.1 to 5.9.2 (#77)
dependabot[bot] Jan 16, 2023
4f0f5cf
CI: publish artifact
HeikoBornholdt Jan 25, 2023
4794ebf
yarn upgrade
HeikoBornholdt Feb 2, 2023
68d4092
Bump react-scripts and @craco/craco in /frontend
dependabot[bot] Feb 2, 2023
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
8 changes: 8 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,19 @@ jobs:

steps:
- uses: actions/checkout@v3

- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: maven

- name: Build with Maven
run: mvn -B package --file pom.xml

- name: Publish artifact
uses: actions/upload-artifact@v3
with:
name: Java
path: ./backend/target/drasyl-network-explorer-spring-boot.jar
10 changes: 5 additions & 5 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<spring.version>2.6.4</spring.version>
<spring.version>2.7.5</spring.version>
</properties>

<dependencies>
Expand All @@ -27,7 +27,7 @@
<dependency>
<groupId>com.maxmind.geoip2</groupId>
<artifactId>geoip2</artifactId>
<version>3.0.0</version>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -42,19 +42,19 @@
<dependency>
<groupId>org.drasyl</groupId>
<artifactId>drasyl-node</artifactId>
<version>0.7.0</version>
<version>0.9.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.0.1-jre</version>
<version>31.1-jre</version>
</dependency>

<!-- Test -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.8.2</version>
<version>5.9.2</version>
<scope>test</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Utility class for IP geolocation.
*/
public class IpLocations {
public static final int MAX_OFFSET_METERS = 100;
public static final int MAX_OFFSET_METERS = 5000;

private static final Logger LOG = LoggerFactory.getLogger(IpLocations.class);
private static final DatabaseReader DB_READER;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public Set<Node> getNodes() {
}

public void addTopology(final InetAddress address, final Topology topology) {
logger.info("Got topology from `{}`: {}", address, topology);
topologies.put(address, topology);
}

Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ logging.level.root: INFO
spring:
data:
mongodb:
uri: "mongodb+srv://..."
uri: "mongodb+srv://change-me-application.yml"

network:
geoip-salt: ""
Expand Down
22 changes: 11 additions & 11 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@craco/craco": "^6.2.0",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"@types/jest": "^26.0.15",
"@types/node": "^12.0.0",
"@craco/craco": "^7.0.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^12.1.5",
"@testing-library/user-event": "^14.4.3",
"@types/jest": "^29.2.4",
"@types/node": "^18.11.10",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@types/react-router-dom": "^5.1.8",
"bip39": "^3.0.4",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-identicons": "^1.2.5",
"react-map-gl": "^5.3.15",
"react-map-gl": "^6.1.20",
"react-router-dom": "^5.3.0",
"react-scripts": "4.0.3",
"typescript": "^4.1.2",
"web-vitals": "^1.0.1"
"react-scripts": "5.0.1",
"typescript": "^4.9.3",
"web-vitals": "^3.1.0"
},
"scripts": {
"start": "craco start",
Expand Down Expand Up @@ -49,7 +49,7 @@
},
"devDependencies": {
"autoprefixer": "^9.8.6",
"postcss": "^7.0.36",
"postcss": "^8.4.21",
"tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.10"
},
"proxy": "http://localhost:8080"
Expand Down
1 change: 1 addition & 0 deletions frontend/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,6 @@
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
<a rel="me" href="https://mastodon.world/@drasyl" style="display: none;">Mastodon</a>
</body>
</html>
Binary file modified frontend/public/logo192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/public/logo512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 1 addition & 40 deletions frontend/src/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading