generator-jhipster 8.0.0-beta.2 → 8.0.0-rc.1

package/dist/generators/server/files.mjs

@@ -23,12 +23,12 @@ import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir, moveToSrcMainResourc
 const imperativeConfigFiles = {
     imperativeFiles: [
         {
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['ApplicationWebXml.java'],
         },
         {
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['config/WebConfigurerTest.java', 'config/WebConfigurerTestController.java'],
         },
@@ -37,12 +37,12 @@ const imperativeConfigFiles = {
 const reactiveConfigFiles = {
     reactiveFiles: [
         {
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['config/ReactorConfiguration.java'],
         },
         {
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['config/JHipsterBlockHoundIntegration.java'],
         },
@@ -55,13 +55,13 @@ const reactiveConfigFiles = {
 const feignFiles = {
     microserviceFeignFiles: [
         {
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['config/FeignConfiguration.java'],
         },
         {
             condition: generator => generator.authenticationTypeOauth2,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: [
                 'security/oauth2/AuthorizationHeaderUtil.java',
@@ -72,13 +72,13 @@ const feignFiles = {
         },
         {
             condition: generator => generator.authenticationTypeJwt,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['client/UserFeignClientInterceptor_jwt.java'],
         },
         {
             condition: generator => generator.authenticationTypeOauth2,
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['security/oauth2/AuthorizationHeaderUtilTest.java'],
         },
@@ -87,7 +87,7 @@ const feignFiles = {
 const oauth2Files = {
     oauth2Files: [
         {
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: [
                 'security/oauth2/AudienceValidator.java',
@@ -96,19 +96,19 @@ const oauth2Files = {
             ],
         },
         {
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['security/oauth2/AudienceValidatorTest.java', 'config/TestSecurityConfiguration.java'],
         },
         {
             condition: generator => generator.applicationTypeMonolith,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['config/OAuth2Configuration.java'],
         },
         {
             condition: generator => generator.generateAuthenticationApi,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['web/rest/AuthInfoResource.java', data => `web/rest/LogoutResource_${data.imperativeOrReactive}.java`],
         },
@@ -117,26 +117,26 @@ const oauth2Files = {
             path: SERVER_MAIN_SRC_DIR,
             templates: [
                 {
-                    file: generator => `package/web/filter/OAuth2${generator.reactive ? 'Reactive' : ''}RefreshTokensWebFilter.java`,
+                    file: generator => `_package_/web/filter/OAuth2${generator.reactive ? 'Reactive' : ''}RefreshTokensWebFilter.java`,
                     renameTo: generator => `${generator.packageFolder}web/filter/OAuth2${generator.reactive ? 'Reactive' : ''}RefreshTokensWebFilter.java`,
                 },
             ],
         },
         {
             condition: generator => generator.generateAuthenticationApi,
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['test/util/OAuth2TestUtil.java', 'web/rest/LogoutResourceIT.java'],
         },
         {
             condition: generator => !generator.reactive && generator.generateAuthenticationApi,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['security/oauth2/CustomClaimConverter.java'],
         },
         {
             condition: generator => !generator.reactive && generator.generateAuthenticationApi,
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['security/oauth2/CustomClaimConverterIT.java'],
         },
@@ -145,7 +145,7 @@ const oauth2Files = {
 const accountFiles = {
     accountResource: [
         {
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: [
                 data => {
@@ -159,12 +159,12 @@ const accountFiles = {
         },
         {
             condition: data => data.generateUserManagement,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['web/rest/vm/ManagedUserVM.java'],
         },
         {
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: [
                 data => {
@@ -181,7 +181,7 @@ const accountFiles = {
 const userManagementFiles = {
     userManagementFiles: [
         {
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: [
                 'security/DomainUserDetailsService.java',
@@ -199,7 +199,7 @@ const userManagementFiles = {
             ],
         },
         {
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['service/MailServiceIT.java', 'security/DomainUserDetailsServiceIT.java'],
         },
@@ -226,12 +226,12 @@ const userManagementFiles = {
 const jwtFiles = {
     jwtBaseFiles: [
         {
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['config/SecurityJwtConfiguration.java', 'management/SecurityMetersService.java'],
         },
         {
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: [
                 'management/SecurityMetersServiceTests.java',
@@ -246,19 +246,19 @@ const jwtFiles = {
     entrypointFiles: [
         {
             condition: data => !data.generateAuthenticationApi,
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['security/jwt/TestAuthenticationResource.java'],
         },
         {
             condition: generator => generator.generateAuthenticationApi,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['web/rest/vm/LoginVM.java', 'web/rest/AuthenticateController.java'],
         },
         {
             condition: generator => generator.generateAuthenticationApi,
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['web/rest/AuthenticateControllerIT.java'],
         },
@@ -268,19 +268,19 @@ const gatewayFiles = {
     gatewayFiles: [
         {
             condition: generator => generator.authenticationTypeJwt,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['security/jwt/JWTRelayGatewayFilterFactory.java'],
         },
         {
             condition: generator => generator.serviceDiscoveryAny,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['web/rest/vm/RouteVM.java', 'web/rest/GatewayResource.java', 'web/filter/ModifyServersOpenApiFilter.java'],
         },
         {
             condition: generator => generator.serviceDiscoveryAny,
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['web/filter/ModifyServersOpenApiFilterTest.java'],
         },
@@ -289,7 +289,7 @@ const gatewayFiles = {
 const swaggerFiles = {
     swagger: [
         {
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['config/OpenApiConfiguration.java'],
         },
@@ -314,9 +314,14 @@ export const baseServerFiles = {
             templates: ['entrypoint.sh'],
         },
     ],
+    readme: [
+        {
+            templates: ['README.md.jhi.spring-boot'],
+        },
+    ],
     packageJson: [
         {
-            condition: generator => generator.skipClient,
+            condition: generator => generator.clientFrameworkNo,
             templates: ['package.json'],
         },
     ],
@@ -343,7 +348,7 @@ export const baseServerFiles = {
             templates: ['pom.xml'],
         },
         {
-            condition: generator => !generator.skipClient,
+            condition: generator => generator.useNpmWrapper,
             transform: false,
             templates: ['npmw', 'npmw.cmd'],
         },
@@ -372,40 +377,40 @@ export const baseServerFiles = {
     serverJavaAuthConfig: [
         {
             condition: generator => !generator.reactive && (generator.databaseTypeSql || generator.databaseTypeMongodb || generator.databaseTypeCouchbase),
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['security/SpringSecurityAuditorAware.java'],
         },
         {
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['security/SecurityUtils.java', 'security/AuthoritiesConstants.java'],
         },
         {
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: [data => `security/SecurityUtilsUnitTest_${data.imperativeOrReactive}.java`],
         },
         {
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: [data => `config/SecurityConfiguration_${data.imperativeOrReactive}.java`],
         },
         {
             condition: data => data.generateInMemoryUserCredentials && !data.reactive && data.authenticationTypeJwt,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['config/SecurityInMemoryConfiguration.java'],
         },
         {
             condition: generator => generator.generateUserManagement && generator.authenticationTypeSession && !generator.reactive,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['security/PersistentTokenRememberMeServices.java', 'domain/PersistentToken.java'],
         },
         {
             condition: generator => generator.generateUserManagement && generator.authenticationTypeSession && !generator.reactive && !generator.databaseTypeCouchbase,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['repository/PersistentTokenRepository.java'],
         },
@@ -430,19 +435,19 @@ export const baseServerFiles = {
         },
         {
             condition: generator => generator.serviceDiscoveryAny && generator.serviceDiscoveryEureka,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['config/EurekaWorkaroundConfiguration.java'],
         },
     ],
     serverJavaApp: [
         {
-            path: `${SERVER_MAIN_SRC_DIR}package`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: (data, filename) => moveToJavaPackageSrcDir(data, filename.replace('Application.java', `${data.mainClass}.java`)),
             templates: ['Application.java'],
         },
         {
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: [
                 'TechnicalStructureTest.java',
@@ -454,7 +459,7 @@ export const baseServerFiles = {
     ],
     serverJavaConfig: [
         {
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: [
                 'aop/logging/LoggingAspect.java',
@@ -474,12 +479,12 @@ export const baseServerFiles = {
                 generator.databaseTypeSql ||
                 generator.databaseTypeMongodb ||
                 generator.databaseTypeCouchbase,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['config/Constants.java'],
         },
         {
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: [data => `config/LocaleConfiguration_${data.imperativeOrReactive}.java`],
         },
@@ -487,14 +492,14 @@ export const baseServerFiles = {
     serverJavaDomain: [
         {
             condition: generator => generator.databaseTypeSql || generator.databaseTypeMongodb || generator.databaseTypeNeo4j || generator.databaseTypeCouchbase,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['domain/AbstractAuditingEntity.java'],
         },
     ],
     serverJavaWebError: [
         {
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: [
                 'web/rest/errors/BadRequestAlertException.java',
@@ -506,45 +511,45 @@ export const baseServerFiles = {
     ],
     serverJavaWeb: [
         {
-            condition: generator => !generator.skipClient && !generator.reactive,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            condition: generator => generator.clientFrameworkAny && !generator.reactive,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['config/StaticResourcesWebConfiguration.java'],
         },
         {
             // TODO : add these tests to reactive
-            condition: generator => !generator.skipClient && !generator.reactive,
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            condition: generator => generator.clientFrameworkAny && !generator.reactive,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['config/StaticResourcesWebConfigurerTest.java'],
         },
         {
-            condition: generator => !generator.skipClient,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            condition: generator => generator.clientFrameworkAny,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: [data => `web/filter/SpaWebFilter_${data.imperativeOrReactive}.java`],
         },
         {
-            condition: generator => !generator.skipClient,
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            condition: generator => generator.clientFrameworkAny,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: [data => `web/filter/SpaWebFilterIT_${data.imperativeOrReactive}.java`],
         },
         {
-            condition: generator => !generator.skipClient && generator.reactive,
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            condition: generator => generator.clientFrameworkAny && generator.reactive,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['web/filter/SpaWebFilterTestController_reactive.java'],
         },
     ],
     serverTestFw: [
         {
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['web/rest/TestUtil.java', 'web/rest/errors/ExceptionTranslatorTestController.java'],
         },
         {
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: [data => `web/rest/errors/ExceptionTranslatorIT_${data.imperativeOrReactive}.java`],
         },
@@ -556,7 +561,7 @@ export const baseServerFiles = {
     serverJavaUserManagement: [
         {
             condition: generator => generator.generateBuiltInAuthorityEntity,
-            path: `${SERVER_MAIN_SRC_DIR}package/`,
+            path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
             templates: ['domain/Authority.java', 'repository/AuthorityRepository.java'],
         },
@@ -565,12 +570,12 @@ export const baseServerFiles = {
                 generator.searchEngineElasticsearch ||
                 generator.databaseTypeCouchbase ||
                 generator.searchEngineCouchbase,
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['config/TestContainersSpringContextCustomizerFactory.java'],
         },
         {
-            path: `${SERVER_TEST_SRC_DIR}package/`,
+            path: `${SERVER_TEST_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageTestDir,
             templates: ['web/rest/WithUnauthenticatedMockUser.java'],
         },