Skip to content

Commit 2b40f8d

Browse files
fniephausfniephaus
committed
Format files and clean up.
1 parent 6985ce8 commit 2b40f8d

File tree

3 files changed

+183
-198
lines changed

3 files changed

+183
-198
lines changed

‎graaljs/graaljs-micronaut-react-ssr/pom.xml‎

Lines changed: 181 additions & 170 deletions
Original file line numberDiff line numberDiff line change
@@ -1,179 +1,190 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
<groupId>com.example</groupId>
6-
<artifactId>graaljs-micronaut-react-ssr</artifactId>
7-
<version>0.1</version>
8-
<packaging>${packaging}</packaging>
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>com.example</groupId>
6+
<artifactId>graaljs-micronaut-react-ssr</artifactId>
7+
<version>0.1</version>
8+
<packaging>${packaging}</packaging>
99

10-
<parent>
11-
<groupId>io.micronaut.platform</groupId>
12-
<artifactId>micronaut-parent</artifactId>
13-
<version>4.8.3</version>
14-
</parent>
15-
<properties>
16-
<packaging>jar</packaging>
17-
<jdk.version>21</jdk.version>
18-
<release.version>21</release.version>
19-
<micronaut.version>4.8.3</micronaut.version>
20-
<micronaut.runtime>netty</micronaut.runtime>
21-
<micronaut.aot.enabled>false</micronaut.aot.enabled>
22-
<micronaut.aot.packageName>com.example.aot.generated</micronaut.aot.packageName>
23-
<exec.mainClass>com.example.Application</exec.mainClass>
24-
</properties>
10+
<parent>
11+
<groupId>io.micronaut.platform</groupId>
12+
<artifactId>micronaut-parent</artifactId>
13+
<version>4.8.3</version>
14+
</parent>
15+
<properties>
16+
<graaljs.version>24.2.2</graaljs.version>
17+
<truffle.jvm.args>--enable-native-access=ALL-UNNAMED --sun-misc-unsafe-memory-access=allow</truffle.jvm.args>
18+
<packaging>jar</packaging>
19+
<jdk.version>21</jdk.version>
20+
<release.version>21</release.version>
21+
<micronaut.version>4.8.3</micronaut.version>
22+
<micronaut.runtime>netty</micronaut.runtime>
23+
<micronaut.aot.enabled>false</micronaut.aot.enabled>
24+
<micronaut.aot.packageName>com.example.aot.generated</micronaut.aot.packageName>
25+
<exec.mainClass>com.example.Application</exec.mainClass>
26+
</properties>
2527

26-
<repositories>
27-
<repository>
28-
<id>central</id>
29-
<url>https://repo.maven.apache.org/maven2</url>
30-
</repository>
31-
</repositories>
28+
<repositories>
29+
<repository>
30+
<id>central</id>
31+
<url>https://repo.maven.apache.org/maven2</url>
32+
</repository>
33+
</repositories>
3234

33-
<dependencies>
34-
<dependency>
35-
<groupId>io.micronaut</groupId>
36-
<artifactId>micronaut-http-server-netty</artifactId>
37-
<scope>compile</scope>
38-
</dependency>
39-
<dependency>
40-
<groupId>io.micronaut.serde</groupId>
41-
<artifactId>micronaut-serde-jackson</artifactId>
42-
<scope>compile</scope>
43-
</dependency>
44-
<dependency>
45-
<groupId>io.micronaut.views</groupId>
46-
<artifactId>micronaut-views-react</artifactId>
47-
<scope>compile</scope>
48-
</dependency>
49-
<dependency>
50-
<groupId>ch.qos.logback</groupId>
51-
<artifactId>logback-classic</artifactId>
52-
<scope>runtime</scope>
53-
</dependency>
54-
<dependency>
55-
<groupId>org.graalvm.js</groupId>
56-
<artifactId>js-language</artifactId>
57-
<version>24.2.2</version>
58-
<scope>runtime</scope>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.graalvm.polyglot</groupId>
62-
<artifactId>polyglot</artifactId>
63-
<version>24.2.2</version>
64-
<scope>runtime</scope>
65-
</dependency>
66-
<dependency>
67-
<groupId>io.micronaut</groupId>
68-
<artifactId>micronaut-http-client</artifactId>
69-
<scope>test</scope>
70-
</dependency>
71-
<dependency>
72-
<groupId>io.micronaut.test</groupId>
73-
<artifactId>micronaut-test-junit5</artifactId>
74-
<scope>test</scope>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.junit.jupiter</groupId>
78-
<artifactId>junit-jupiter-api</artifactId>
79-
<scope>test</scope>
80-
</dependency>
81-
<dependency>
82-
<groupId>org.junit.jupiter</groupId>
83-
<artifactId>junit-jupiter-engine</artifactId>
84-
<scope>test</scope>
85-
</dependency>
86-
</dependencies>
87-
<build>
88-
<plugins>
89-
<plugin>
90-
<groupId>io.micronaut.maven</groupId>
91-
<artifactId>micronaut-maven-plugin</artifactId>
92-
<configuration>
93-
<configFile>aot-${packaging}.properties</configFile>
94-
</configuration>
95-
</plugin>
96-
<plugin>
97-
<groupId>org.apache.maven.plugins</groupId>
98-
<artifactId>maven-enforcer-plugin</artifactId>
99-
</plugin>
100-
<plugin>
101-
<groupId>com.github.eirslett</groupId>
102-
<artifactId>frontend-maven-plugin</artifactId>
103-
<version>1.15.0</version>
104-
105-
<executions>
106-
<execution>
107-
<id>install node and npm</id>
108-
<goals><goal>install-node-and-npm</goal></goals>
109-
</execution>
110-
111-
<execution>
112-
<id>npm install</id>
113-
<goals><goal>npm</goal></goals>
114-
</execution>
115-
116-
<execution>
117-
<id>webpack build server</id>
118-
<goals><goal>webpack</goal></goals>
119-
<configuration>
120-
<arguments>--mode production --config webpack.server.js</arguments>
121-
<environmentVariables>
122-
<BUILD_DIR>${project.build.outputDirectory}/views</BUILD_DIR>
123-
</environmentVariables>
124-
</configuration>
125-
</execution>
126-
127-
<execution>
128-
<id>webpack build client</id>
129-
<goals><goal>webpack</goal></goals>
130-
<configuration>
131-
<arguments>--mode production --config webpack.client.js</arguments>
132-
<environmentVariables>
133-
<BUILD_DIR>${project.build.outputDirectory}/views/static</BUILD_DIR>
134-
</environmentVariables>
135-
</configuration>
136-
</execution>
137-
</executions>
138-
139-
<configuration>
140-
<nodeVersion>v21.7.2</nodeVersion>
141-
<workingDirectory>src/main/js</workingDirectory>
142-
<installDirectory>target</installDirectory>
143-
</configuration>
144-
</plugin>
145-
<plugin>
146-
<groupId>org.apache.maven.plugins</groupId>
147-
<artifactId>maven-compiler-plugin</artifactId>
148-
<configuration>
149-
<!-- Uncomment to enable incremental compilation -->
150-
<!-- <useIncrementalCompilation>false</useIncrementalCompilation> -->
35+
<dependencies>
36+
<dependency>
37+
<groupId>io.micronaut</groupId>
38+
<artifactId>micronaut-http-server-netty</artifactId>
39+
<scope>compile</scope>
40+
</dependency>
41+
<dependency>
42+
<groupId>io.micronaut.serde</groupId>
43+
<artifactId>micronaut-serde-jackson</artifactId>
44+
<scope>compile</scope>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.micronaut.views</groupId>
48+
<artifactId>micronaut-views-react</artifactId>
49+
<scope>compile</scope>
50+
</dependency>
51+
<dependency>
52+
<groupId>ch.qos.logback</groupId>
53+
<artifactId>logback-classic</artifactId>
54+
<scope>runtime</scope>
55+
</dependency>
56+
<dependency>
57+
<groupId>org.graalvm.js</groupId>
58+
<artifactId>js-language</artifactId>
59+
<version>${graaljs.version}</version>
60+
<scope>runtime</scope>
61+
</dependency>
62+
<dependency>
63+
<groupId>org.graalvm.polyglot</groupId>
64+
<artifactId>polyglot</artifactId>
65+
<version>${graaljs.version}</version>
66+
<scope>runtime</scope>
67+
</dependency>
68+
<dependency>
69+
<groupId>io.micronaut</groupId>
70+
<artifactId>micronaut-http-client</artifactId>
71+
<scope>test</scope>
72+
</dependency>
73+
<dependency>
74+
<groupId>io.micronaut.test</groupId>
75+
<artifactId>micronaut-test-junit5</artifactId>
76+
<scope>test</scope>
77+
</dependency>
78+
<dependency>
79+
<groupId>org.junit.jupiter</groupId>
80+
<artifactId>junit-jupiter-api</artifactId>
81+
<scope>test</scope>
82+
</dependency>
83+
<dependency>
84+
<groupId>org.junit.jupiter</groupId>
85+
<artifactId>junit-jupiter-engine</artifactId>
86+
<scope>test</scope>
87+
</dependency>
88+
</dependencies>
89+
<build>
90+
<plugins>
91+
<plugin>
92+
<groupId>io.micronaut.maven</groupId>
93+
<artifactId>micronaut-maven-plugin</artifactId>
94+
<configuration>
95+
<configFile>aot-${packaging}.properties</configFile>
96+
<jvmArguments>${truffle.jvm.args}</jvmArguments>
97+
</configuration>
98+
</plugin>
99+
<plugin>
100+
<groupId>org.apache.maven.plugins</groupId>
101+
<artifactId>maven-enforcer-plugin</artifactId>
102+
</plugin>
103+
<plugin>
104+
<groupId>com.github.eirslett</groupId>
105+
<artifactId>frontend-maven-plugin</artifactId>
106+
<version>1.15.0</version>
151107

152-
<annotationProcessorPaths combine.children="append">
153-
<path>
154-
<groupId>io.micronaut</groupId>
155-
<artifactId>micronaut-http-validation</artifactId>
156-
<version>${micronaut.core.version}</version>
157-
</path>
158-
<path>
159-
<groupId>io.micronaut.serde</groupId>
160-
<artifactId>micronaut-serde-processor</artifactId>
161-
<version>${micronaut.serialization.version}</version>
162-
<exclusions>
163-
<exclusion>
164-
<groupId>io.micronaut</groupId>
165-
<artifactId>micronaut-inject</artifactId>
166-
</exclusion>
167-
</exclusions>
168-
</path>
169-
</annotationProcessorPaths>
170-
<compilerArgs>
171-
<arg>-Amicronaut.processing.group=com.example</arg>
172-
<arg>-Amicronaut.processing.module=graaljs-micronaut-react-ssr</arg>
173-
</compilerArgs>
174-
</configuration>
175-
</plugin>
176-
</plugins>
177-
</build>
108+
<executions>
109+
<execution>
110+
<id>install node and npm</id>
111+
<goals>
112+
<goal>install-node-and-npm</goal>
113+
</goals>
114+
</execution>
115+
116+
<execution>
117+
<id>npm install</id>
118+
<goals>
119+
<goal>npm</goal>
120+
</goals>
121+
</execution>
122+
123+
<execution>
124+
<id>webpack build server</id>
125+
<goals>
126+
<goal>webpack</goal>
127+
</goals>
128+
<configuration>
129+
<arguments>--mode production --config webpack.server.js</arguments>
130+
<environmentVariables>
131+
<BUILD_DIR>${project.build.outputDirectory}/views</BUILD_DIR>
132+
</environmentVariables>
133+
</configuration>
134+
</execution>
135+
136+
<execution>
137+
<id>webpack build client</id>
138+
<goals>
139+
<goal>webpack</goal>
140+
</goals>
141+
<configuration>
142+
<arguments>--mode production --config webpack.client.js</arguments>
143+
<environmentVariables>
144+
<BUILD_DIR>${project.build.outputDirectory}/views/static</BUILD_DIR>
145+
</environmentVariables>
146+
</configuration>
147+
</execution>
148+
</executions>
149+
150+
<configuration>
151+
<nodeVersion>v21.7.2</nodeVersion>
152+
<workingDirectory>src/main/js</workingDirectory>
153+
<installDirectory>target</installDirectory>
154+
</configuration>
155+
</plugin>
156+
<plugin>
157+
<groupId>org.apache.maven.plugins</groupId>
158+
<artifactId>maven-compiler-plugin</artifactId>
159+
<configuration>
160+
<!-- Uncomment to enable incremental compilation -->
161+
<!-- <useIncrementalCompilation>false</useIncrementalCompilation> -->
162+
163+
<annotationProcessorPaths combine.children="append">
164+
<path>
165+
<groupId>io.micronaut</groupId>
166+
<artifactId>micronaut-http-validation</artifactId>
167+
<version>${micronaut.core.version}</version>
168+
</path>
169+
<path>
170+
<groupId>io.micronaut.serde</groupId>
171+
<artifactId>micronaut-serde-processor</artifactId>
172+
<version>${micronaut.serialization.version}</version>
173+
<exclusions>
174+
<exclusion>
175+
<groupId>io.micronaut</groupId>
176+
<artifactId>micronaut-inject</artifactId>
177+
</exclusion>
178+
</exclusions>
179+
</path>
180+
</annotationProcessorPaths>
181+
<compilerArgs>
182+
<arg>-Amicronaut.processing.group=com.example</arg>
183+
<arg>-Amicronaut.processing.module=graaljs-micronaut-react-ssr</arg>
184+
</compilerArgs>
185+
</configuration>
186+
</plugin>
187+
</plugins>
188+
</build>
178189

179190
</project>

‎graaljs/graaljs-micronaut-react-ssr/src/test/java/com/example/GraaljsReactSsrTest.java‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎graaljs/graaljs-micronaut-react-ssr/src/test/java/com/example/RootViewTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
@MicronautTest
1818
public class RootViewTest {
19-
@Inject @Client("/")
19+
@Inject
20+
@Client("/")
2021
HttpClient client;
2122

2223
@Test

0 commit comments

Comments
 (0)