fixes

mshima · Oct 23, 2024 · 89ea24a · 89ea24a
1 parent 37629da
commit 89ea24a
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 12 deletions.
diff --git a/...alvm/__snapshots__/generator.spec.ts.snap → ...alvm/__snapshots__/generator.spec.ts.snap b/...alvm/__snapshots__/generator.spec.ts.snap → ...alvm/__snapshots__/generator.spec.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`generator - spring-boot:graalvm with default options should call source snapshot 1`] = `
+exports[`generator - java:graalvm with default options should call source snapshot 1`] = `
 {
   "addMavenDefinition": [
     {
@@ -164,7 +164,7 @@ exports[`generator - spring-boot:graalvm with default options should call source
 }
 `;
 
-exports[`generator - spring-boot:graalvm with default options should call source snapshot 2`] = `
+exports[`generator - java:graalvm with default options should call source snapshot 2`] = `
 {
   "addGradleDependencyCatalogPlugin": [
     {
@@ -217,7 +217,7 @@ exports[`generator - spring-boot:graalvm with default options should call source
 }
 `;
 
-exports[`generator - spring-boot:graalvm with default options should match files snapshot 1`] = `
+exports[`generator - java:graalvm with default options should match files snapshot 1`] = `
 {
   ".yo-rc.json": {
     "stateCleared": "modified",
@@ -231,7 +231,7 @@ exports[`generator - spring-boot:graalvm with default options should match files
 }
 `;
 
-exports[`generator - spring-boot:graalvm with default options should match files snapshot 2`] = `
+exports[`generator - java:graalvm with default options should match files snapshot 2`] = `
 {
   ".yo-rc.json": {
     "stateCleared": "modified",

diff --git a/...spring-boot/generators/graalvm/command.ts → ...rators/java/generators/graalvm/command.ts b/...spring-boot/generators/graalvm/command.ts → ...rators/java/generators/graalvm/command.ts
diff --git a/...boot/generators/graalvm/generator.spec.ts → ...java/generators/graalvm/generator.spec.ts b/...boot/generators/graalvm/generator.spec.ts → ...java/generators/graalvm/generator.spec.ts
diff --git a/...ring-boot/generators/graalvm/generator.ts → ...tors/java/generators/graalvm/generator.ts b/...ring-boot/generators/graalvm/generator.ts → ...tors/java/generators/graalvm/generator.ts
diff --git a/...s/spring-boot/generators/graalvm/index.ts → generators/java/generators/graalvm/index.ts b/...s/spring-boot/generators/graalvm/index.ts → generators/java/generators/graalvm/index.ts
diff --git a/...tors/graalvm/internal/maven-definition.ts → ...tors/graalvm/internal/maven-definition.ts b/...tors/graalvm/internal/maven-definition.ts → ...tors/graalvm/internal/maven-definition.ts
diff --git a/...generators/graalvm/resources/build.gradle → ...generators/graalvm/resources/build.gradle b/...generators/graalvm/resources/build.gradle → ...generators/graalvm/resources/build.gradle
diff --git a/...aalvm/resources/gradle/libs.versions.toml → ...aalvm/resources/gradle/libs.versions.toml b/...aalvm/resources/gradle/libs.versions.toml → ...aalvm/resources/gradle/libs.versions.toml
diff --git a/...raalvm/templates/README.md.jhi.native.ejs → ...raalvm/templates/README.md.jhi.native.ejs b/...raalvm/templates/README.md.jhi.native.ejs → ...raalvm/templates/README.md.jhi.native.ejs
@@ -20,12 +20,6 @@
  This is a fragment file, it will be merged into to root template if available.
  EJS fragments will process % delimiter tags in template and & delimiter tags in the merge process.
 -%>
-<&_ if (fragment.introSection) { -&>
-The project has also been extended with [JHipster Native](https://github.com/jhipster/generator-jhipster-native) Blueprint.
-See what's been added here to learn [About Native Build](#about-native-build).
-
-<&_ } -&>
-
 <&_ if (fragment.othersSection) { -&>
 ### About Native Build
 
@@ -40,17 +34,20 @@ sdk install java 21-graalce
 To build a native image, execute the following command:
 ```bash
 npm run native-package
+# <%- packageJsonScripts['native-package'] %>
 ```
 
-After that, set up peripheral services like PostgreSQL using `npm run services:up` and ensure everything is ready.
+After that, set up peripheral services like PostgreSQL using `npm run services:up`(<%- packageJsonScripts['services:up'] %>) and ensure everything is ready.
 
 Lastly, run the Native image and experience its fast startup 😊.
 ```bash
 npm run native-start
+# <%- packageJsonScripts['native-start'] %>
 ```
 
 If you've enabled e2e testing with Cypress, you can verify its operation using the following command:
 ```bash
 npm run native-e2e
+# <%- packageJsonScripts['native-e2e'] %>
 ```
 <&_ } -&>
diff --git a/...raalvm/templates/gradle/native.gradle.ejs → ...raalvm/templates/gradle/native.gradle.ejs b/...raalvm/templates/gradle/native.gradle.ejs → ...raalvm/templates/gradle/native.gradle.ejs
diff --git a/...kage_/config/NativeConfiguration.java.ejs → ...kage_/config/NativeConfiguration.java.ejs b/...kage_/config/NativeConfiguration.java.ejs → ...kage_/config/NativeConfiguration.java.ejs
diff --git a/generators/spring-boot/generator.ts b/generators/spring-boot/generator.ts
@@ -157,7 +157,7 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
         await this.composeWithJHipster('jhipster:java:code-quality');
 
         if (this.jhipsterConfigWithDefaults.graalvmSupport) {
-          await this.composeWithJHipster('jhipster:spring-boot:graalvm');
+          await this.composeWithJHipster('jhipster:java:graalvm');
         }
 
         if (enableSwaggerCodegen) {