diff --git a/generators/client/files-vue.js b/.blueprint/cli/commands.mjs similarity index 61% rename from generators/client/files-vue.js rename to .blueprint/cli/commands.mjs index 1f6b3d9e4..6ff7b4e13 100644 --- a/generators/client/files-vue.js +++ b/.blueprint/cli/commands.mjs @@ -8,7 +8,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -17,20 +17,11 @@ * limitations under the License. */ -const constants = require('../generator-dotnetcore-constants.cjs'); - -/* Constants use throughout */ -const SERVER_SRC_DIR = constants.SERVER_SRC_DIR; - - -function updateHomeTitle() { - this.replaceContent(`${SERVER_SRC_DIR}${this.mainClientAppDir}/app/core/home/home.vue`, 'Java', '.Net Core', false); -} - -function writeFiles() { - updateHomeTitle.call(this); -} - -module.exports = { - writeFiles, +const defaultCommands = { + 'generate-sample': { + desc: 'Generate a test sample', + blueprint: '@jhipster/jhipster-dev', + }, }; + +export default defaultCommands; diff --git a/.blueprint/generate-sample/command.mjs b/.blueprint/generate-sample/command.mjs new file mode 100644 index 000000000..4906cad62 --- /dev/null +++ b/.blueprint/generate-sample/command.mjs @@ -0,0 +1,42 @@ +/** + * Copyright 2013-2023 the original author or authors from the JHipster project. + * + * This file is part of the JHipster project, see https://www.jhipster.tech/ + * for more information. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { GENERATOR_APP } from 'generator-jhipster/generators'; +/** + * @type {import('generator-jhipster').JHipsterCommandDefinition} + */ +const command = { + arguments: { + sampleName: { + type: String, + }, + }, + options: { + withEntities: { + type: Boolean, + scope: 'generator', + }, + configOnly: { + type: Boolean, + scope: 'generator', + }, + }, + import: [GENERATOR_APP], +}; + +export default command; diff --git a/.blueprint/generate-sample/generator.mjs b/.blueprint/generate-sample/generator.mjs new file mode 100644 index 000000000..349df8716 --- /dev/null +++ b/.blueprint/generate-sample/generator.mjs @@ -0,0 +1,109 @@ +import { readdir, stat } from 'node:fs/promises'; +import BaseGenerator from 'generator-jhipster/generators/base'; +import command from './command.mjs'; +import { statSync } from 'node:fs'; + +export default class extends BaseGenerator { + sampleName; + jdlSample; + withEntities; + configOnly; + + get [BaseGenerator.INITIALIZING]() { + return this.asInitializingTaskGroup({ + async initializeOptions() { + this.parseJHipsterCommand(command); + }, + }); + } + + get [BaseGenerator.PROMPTING]() { + return this.asPromptingTaskGroup({ + async askForSample() { + if (!this.sampleName) { + const answers = await this.prompt({ + type: 'list', + name: 'sampleName', + message: 'which sample do you want to generate?', + choices: async () => readdir(this.templatePath('samples')), + }); + this.sampleName = answers.sampleName; + } + }, + }); + } + + get [BaseGenerator.WRITING]() { + return this.asWritingTaskGroup({ + async copySample() { + let isDir = false; + let jdlFile = false; + try { + const pathStat = await stat(this.templatePath(`samples/${this.sampleName}`)); + isDir = pathStat.isDirectory(); + jdlFile = pathStat.isFile(); + } catch (error) { + try { + this.sampleName += '.jdl'; + jdlFile = (await stat(this.templatePath(`samples/${this.sampleName}`))).isFile(); + } catch { + throw error; + } + } + + if (jdlFile) { + this.jdlSample = this.sampleName; + this.copyTemplate(`samples/${this.sampleName}`, this.sampleName, { noGlob: true }); + } else if (isDir) { + this.copyTemplate(`samples/${this.sampleName}/.yo-rc.json`, '.yo-rc.json', { noGlob: true }); + } else { + throw new Error(`Sample ${this.sampleName} was not identified`); + } + }, + async jdlEntities() { + if (this.withEntities) { + if (this.sampleName.includes('-mongo-')) { + this.jdlSample = 'app_mongo.jdl'; + } else if (this.sampleName.includes('-react-')) { + this.jdlSample = 'app-react.jdl'; + } else { + this.jdlSample = 'app.jdl'; + } + this.copyTemplate(`samples/jdl-default/${this.jdlSample}`, this.jdlSample, { noGlob: true }); + } + }, + }); + } + + get [BaseGenerator.END]() { + return this.asEndTaskGroup({ + async generateSample() { + if (this.jdlSample && !this.configOnly) { + await this.composeWithJHipster('jdl', { + generatorArgs: [this.jdlSample], + generatorOptions: { + jsonOnly: true, + }, + }); + } + }, + async generateApp() { + if (this.configOnly) { + return; + } + + await this.composeWithJHipster('app', { + generatorOptions: { + skipJhipsterDependencies: true, + insight: false, + skipChecks: true, + skipInstall: true, + }, + }); + }, + async jhipsterInfo() { + await this.composeWithJHipster('info'); + }, + }); + } +} diff --git a/.blueprint/generate-sample/index.mjs b/.blueprint/generate-sample/index.mjs new file mode 100644 index 000000000..3dd0513e5 --- /dev/null +++ b/.blueprint/generate-sample/index.mjs @@ -0,0 +1,2 @@ +export { default } from './generator.mjs'; +export { default as command } from './command.mjs'; diff --git a/test-integration/samples/csharp-di-test/CountryExtendedService.cs b/.blueprint/generate-sample/templates/samples/csharp-di-test/CountryExtendedService.cs similarity index 100% rename from test-integration/samples/csharp-di-test/CountryExtendedService.cs rename to .blueprint/generate-sample/templates/samples/csharp-di-test/CountryExtendedService.cs diff --git a/test-integration/samples/csharp-di-test/ExtendedServiceRegistrationTest.cs b/.blueprint/generate-sample/templates/samples/csharp-di-test/ExtendedServiceRegistrationTest.cs similarity index 100% rename from test-integration/samples/csharp-di-test/ExtendedServiceRegistrationTest.cs rename to .blueprint/generate-sample/templates/samples/csharp-di-test/ExtendedServiceRegistrationTest.cs diff --git a/test-integration/samples/gateway-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/gateway-app/.yo-rc.json similarity index 79% rename from test-integration/samples/gateway-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/gateway-app/.yo-rc.json index 832f23f3f..888e93465 100644 --- a/test-integration/samples/gateway-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/gateway-app/.yo-rc.json @@ -19,16 +19,9 @@ "jhiPrefix": "jhi", "entitySuffix": "", "dtoSuffix": "DTO", - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/.blueprint/generate-sample/templates/samples/jdl-default/app-react.jdl b/.blueprint/generate-sample/templates/samples/jdl-default/app-react.jdl new file mode 100644 index 000000000..b97331a39 --- /dev/null +++ b/.blueprint/generate-sample/templates/samples/jdl-default/app-react.jdl @@ -0,0 +1,117 @@ +entity Region { + regionName String +} + +entity Country { + countryName String +} + +// an ignored comment +/** not an ignored comment */ +entity Location { + streetAddress String, + postalCode String, + city String, + stateProvince String +} + +entity Department { + departmentName String required +} + +/** + * PieceOfWork entity. + * @author The JHipster team. + */ +entity PieceOfWork { + title String, + description String +} + +/** + * The Employee entity. + */ +entity Employee { + /** + * The firstname attribute. + */ + firstName String, + lastName String, + email String, + phoneNumber String, + hireDate Instant, + salary Long, + commissionPct Long +} + +entity Job { + jobTitle String, + minSalary Long, + maxSalary Long +} + +entity JobHistory { + startDate Instant, + endDate Instant, + language Language +} + +enum Language { + FRENCH, ENGLISH, SPANISH +} + + + +relationship OneToOne { + Country{region} to Region +} + +relationship OneToOne { + Location{country} to Country +} + +relationship OneToOne { + Department{location} to Location +} + +// defining multiple OneToMany relationships with comments +relationship OneToMany { + Employee to Job{employee}, + /** + * A relationship + */ + Department to + /** + * Another side of the same relationship + */ + Employee{department} +} + +relationship ManyToOne { + Employee{manager} to Employee +} + +// defining multiple oneToOne relationships +relationship OneToOne { + JobHistory{job} to Job, + JobHistory{department} to Department, + JobHistory{employee} to Employee +} + +relationship ManyToMany { + Job{chore(title)} to PieceOfWork{job} +} + +// Set pagination options +// .Net does not generates link header for pagination. +// paginate JobHistory, Employee with infinite-scroll +// paginate Job with pagination + +// Use Data Transfert Objects (DTO) +dto * with mapstruct + +// Set service options to all except few +service all with serviceImpl except Employee, Job + +// Set an angular suffix +// angularSuffix * with mySuffix diff --git a/test-integration/samples/jdl-default/app.jdl b/.blueprint/generate-sample/templates/samples/jdl-default/app.jdl similarity index 100% rename from test-integration/samples/jdl-default/app.jdl rename to .blueprint/generate-sample/templates/samples/jdl-default/app.jdl diff --git a/test-integration/samples/jdl-default/app_mongo.jdl b/.blueprint/generate-sample/templates/samples/jdl-default/app_mongo.jdl similarity index 100% rename from test-integration/samples/jdl-default/app_mongo.jdl rename to .blueprint/generate-sample/templates/samples/jdl-default/app_mongo.jdl diff --git a/test-integration/samples/jwt-with-angular-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/jwt-with-angular-app/.yo-rc.json similarity index 79% rename from test-integration/samples/jwt-with-angular-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/jwt-with-angular-app/.yo-rc.json index 6fac971dd..e50bebb02 100644 --- a/test-integration/samples/jwt-with-angular-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/jwt-with-angular-app/.yo-rc.json @@ -19,16 +19,9 @@ "entitySuffix": "", "dtoSuffix": "DTO", "testFrameworks": ["cypress"], - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/jwt-with-postgres-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/jwt-with-angular-cqrs-app/.yo-rc.json similarity index 76% rename from test-integration/samples/jwt-with-postgres-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/jwt-with-angular-cqrs-app/.yo-rc.json index 140f71ec2..d0a3f35ae 100644 --- a/test-integration/samples/jwt-with-postgres-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/jwt-with-angular-cqrs-app/.yo-rc.json @@ -5,8 +5,9 @@ "packageName": "JhipsterSampleApplication", "authenticationType": "jwt", "serverPort": "5000", - "databaseType": "postgres", + "databaseType": "sqllite", "prodDatabaseType": "mysql", + "cqrsEnabled": true, "enableTranslation": false, "namespace": "JhipsterSampleApplication", "jhipsterVersion": "7.9.3", @@ -19,16 +20,9 @@ "entitySuffix": "", "dtoSuffix": "DTO", "testFrameworks": ["cypress"], - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/jwt-with-blazor-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/jwt-with-blazor-app/.yo-rc.json similarity index 78% rename from test-integration/samples/jwt-with-blazor-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/jwt-with-blazor-app/.yo-rc.json index 51c0486da..39e421c6e 100644 --- a/test-integration/samples/jwt-with-blazor-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/jwt-with-blazor-app/.yo-rc.json @@ -18,16 +18,9 @@ "jhiPrefix": "jhi", "entitySuffix": "", "dtoSuffix": "DTO", - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/jwt-with-blazor-cqrs-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/jwt-with-blazor-cqrs-app/.yo-rc.json similarity index 79% rename from test-integration/samples/jwt-with-blazor-cqrs-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/jwt-with-blazor-cqrs-app/.yo-rc.json index 6f05401af..be984fd5c 100644 --- a/test-integration/samples/jwt-with-blazor-cqrs-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/jwt-with-blazor-cqrs-app/.yo-rc.json @@ -19,16 +19,9 @@ "jhiPrefix": "jhi", "entitySuffix": "", "dtoSuffix": "DTO", - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/jwt-with-mongo-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/jwt-with-mongo-app/.yo-rc.json similarity index 79% rename from test-integration/samples/jwt-with-mongo-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/jwt-with-mongo-app/.yo-rc.json index 4876f2a7c..9f1d7e2be 100644 --- a/test-integration/samples/jwt-with-mongo-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/jwt-with-mongo-app/.yo-rc.json @@ -19,16 +19,9 @@ "entitySuffix": "", "dtoSuffix": "DTO", "testFrameworks": ["cypress"], - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/jwt-with-mongo-cqrs-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/jwt-with-mongo-cqrs-app/.yo-rc.json similarity index 77% rename from test-integration/samples/jwt-with-mongo-cqrs-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/jwt-with-mongo-cqrs-app/.yo-rc.json index 4d62bc0e9..756d08c00 100644 --- a/test-integration/samples/jwt-with-mongo-cqrs-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/jwt-with-mongo-cqrs-app/.yo-rc.json @@ -7,7 +7,7 @@ "serverPort": "5000", "databaseType": "mongodb", "prodDatabaseType": "mongodb", - "cqrsEnabled": true, + "cqrsEnabled": true, "enableTranslation": false, "namespace": "JhipsterSampleApplication", "jhipsterVersion": "7.9.3", @@ -20,16 +20,9 @@ "entitySuffix": "", "dtoSuffix": "DTO", "testFrameworks": ["cypress"], - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/jwt-with-mssql-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/jwt-with-mssql-app/.yo-rc.json similarity index 79% rename from test-integration/samples/jwt-with-mssql-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/jwt-with-mssql-app/.yo-rc.json index b87911e5c..ffd6c3270 100644 --- a/test-integration/samples/jwt-with-mssql-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/jwt-with-mssql-app/.yo-rc.json @@ -19,16 +19,9 @@ "entitySuffix": "", "dtoSuffix": "DTO", "testFrameworks": ["cypress"], - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/jwt-with-mysql-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/jwt-with-mysql-app/.yo-rc.json similarity index 79% rename from test-integration/samples/jwt-with-mysql-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/jwt-with-mysql-app/.yo-rc.json index b23cf6944..91884ae26 100644 --- a/test-integration/samples/jwt-with-mysql-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/jwt-with-mysql-app/.yo-rc.json @@ -19,16 +19,9 @@ "entitySuffix": "", "dtoSuffix": "DTO", "testFrameworks": ["cypress"], - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/jwt-with-oracle-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/jwt-with-oracle-app/.yo-rc.json similarity index 78% rename from test-integration/samples/jwt-with-oracle-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/jwt-with-oracle-app/.yo-rc.json index 0b7b2053f..7d8a63e84 100644 --- a/test-integration/samples/jwt-with-oracle-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/jwt-with-oracle-app/.yo-rc.json @@ -18,16 +18,9 @@ "jhiPrefix": "jhi", "entitySuffix": "", "dtoSuffix": "DTO", - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/.blueprint/generate-sample/templates/samples/jwt-with-postgres-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/jwt-with-postgres-app/.yo-rc.json new file mode 100644 index 000000000..0fbc8c262 --- /dev/null +++ b/.blueprint/generate-sample/templates/samples/jwt-with-postgres-app/.yo-rc.json @@ -0,0 +1,31 @@ +{ + "generator-jhipster": { + "applicationType": "monolith", + "baseName": "JhipsterSampleApplication", + "packageName": "JhipsterSampleApplication", + "authenticationType": "jwt", + "serverPort": "5000", + "databaseType": "postgresql", + "prodDatabaseType": "mysql", + "enableTranslation": false, + "namespace": "JhipsterSampleApplication", + "jhipsterVersion": "7.9.3", + "useSass": true, + "clientPackageManager": "npm", + "clientFramework": "angularX", + "clientTheme": "none", + "creationTimestamp": 1585496278113, + "jhiPrefix": "jhi", + "entitySuffix": "", + "dtoSuffix": "DTO", + "testFrameworks": ["cypress"], + "blueprints": [ + { + "name": "generator-jhipster-dotnetcore" + } + ] + }, + "generator-jhipster-dotnetcore": { + "ciType": "Github" + } +} diff --git a/test-integration/samples/jwt-with-react-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/jwt-with-react-app/.yo-rc.json similarity index 79% rename from test-integration/samples/jwt-with-react-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/jwt-with-react-app/.yo-rc.json index ba22eb962..d4ff10a0a 100644 --- a/test-integration/samples/jwt-with-react-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/jwt-with-react-app/.yo-rc.json @@ -19,17 +19,10 @@ "entitySuffix": "", "dtoSuffix": "DTO", "testFrameworks": ["cypress"], - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "enableTranslation": false, "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/jwt-with-vue-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/jwt-with-vue-app/.yo-rc.json similarity index 87% rename from test-integration/samples/jwt-with-vue-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/jwt-with-vue-app/.yo-rc.json index fb99946e0..a8951f1c8 100644 --- a/test-integration/samples/jwt-with-vue-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/jwt-with-vue-app/.yo-rc.json @@ -18,12 +18,6 @@ "entitySuffix": "", "dtoSuffix": "DTO", "testFrameworks": ["cypress"], - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "enableTranslation": false, "blueprints": [ { diff --git a/test-integration/samples/microservice-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/microservice-app/.yo-rc.json similarity index 76% rename from test-integration/samples/microservice-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/microservice-app/.yo-rc.json index 719ff44b4..c9162754b 100644 --- a/test-integration/samples/microservice-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/microservice-app/.yo-rc.json @@ -13,22 +13,14 @@ "jhipsterVersion": "7.9.3", "useSass": true, "clientPackageManager": "npm", - "clientFramework": "angularX", "clientTheme": "none", "creationTimestamp": 1585496278113, "jhiPrefix": "jhi", "entitySuffix": "", "dtoSuffix": "DTO", - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/oauth-with-angular-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/oauth-with-angular-app/.yo-rc.json similarity index 79% rename from test-integration/samples/oauth-with-angular-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/oauth-with-angular-app/.yo-rc.json index 56baa3b3b..baf488fa5 100644 --- a/test-integration/samples/oauth-with-angular-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/oauth-with-angular-app/.yo-rc.json @@ -18,17 +18,10 @@ "jhiPrefix": "jhi", "entitySuffix": "", "dtoSuffix": "DTO", - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "enableTranslation": false, "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/oauth-with-angular-cqrs-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/oauth-with-angular-cqrs-app/.yo-rc.json similarity index 77% rename from test-integration/samples/oauth-with-angular-cqrs-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/oauth-with-angular-cqrs-app/.yo-rc.json index a56cd5aa4..550842177 100644 --- a/test-integration/samples/oauth-with-angular-cqrs-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/oauth-with-angular-cqrs-app/.yo-rc.json @@ -5,7 +5,7 @@ "prodDatabaseType": "mysql", "authenticationType": "oauth2", "serverPort": "5000", - "cqrsEnabled": true, + "cqrsEnabled": true, "jhipsterVersion": "7.9.3", "applicationType": "monolith", "baseName": "JhipsterSampleApplication", @@ -19,17 +19,10 @@ "jhiPrefix": "jhi", "entitySuffix": "", "dtoSuffix": "DTO", - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "enableTranslation": false, "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/oauth-with-mongo-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/oauth-with-mongo-app/.yo-rc.json similarity index 78% rename from test-integration/samples/oauth-with-mongo-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/oauth-with-mongo-app/.yo-rc.json index 88dad6a3a..41431afc6 100644 --- a/test-integration/samples/oauth-with-mongo-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/oauth-with-mongo-app/.yo-rc.json @@ -18,16 +18,9 @@ "jhiPrefix": "jhi", "entitySuffix": "", "dtoSuffix": "DTO", - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/oauth-with-mongo-cqrs-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/oauth-with-mongo-cqrs-app/.yo-rc.json similarity index 76% rename from test-integration/samples/oauth-with-mongo-cqrs-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/oauth-with-mongo-cqrs-app/.yo-rc.json index 49554741f..232001204 100644 --- a/test-integration/samples/oauth-with-mongo-cqrs-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/oauth-with-mongo-cqrs-app/.yo-rc.json @@ -7,7 +7,7 @@ "serverPort": "5000", "databaseType": "mongodb", "prodDatabaseType": "mongodb", - "cqrsEnabled": true, + "cqrsEnabled": true, "enableTranslation": false, "namespace": "JhipsterSampleApplication", "jhipsterVersion": "7.9.3", @@ -19,16 +19,9 @@ "jhiPrefix": "jhi", "entitySuffix": "", "dtoSuffix": "DTO", - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/oauth-with-mssql-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/oauth-with-mssql-app/.yo-rc.json similarity index 78% rename from test-integration/samples/oauth-with-mssql-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/oauth-with-mssql-app/.yo-rc.json index e15ffd190..262a7c836 100644 --- a/test-integration/samples/oauth-with-mssql-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/oauth-with-mssql-app/.yo-rc.json @@ -18,17 +18,10 @@ "jhiPrefix": "jhi", "entitySuffix": "", "dtoSuffix": "DTO", - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "enableTranslation": false, "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/oauth-with-mysql-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/oauth-with-mysql-app/.yo-rc.json similarity index 78% rename from test-integration/samples/oauth-with-mysql-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/oauth-with-mysql-app/.yo-rc.json index ce54d36b0..93be1c32f 100644 --- a/test-integration/samples/oauth-with-mysql-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/oauth-with-mysql-app/.yo-rc.json @@ -18,17 +18,10 @@ "jhiPrefix": "jhi", "entitySuffix": "", "dtoSuffix": "DTO", - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "enableTranslation": false, "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/oauth-with-oracle-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/oauth-with-oracle-app/.yo-rc.json similarity index 79% rename from test-integration/samples/oauth-with-oracle-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/oauth-with-oracle-app/.yo-rc.json index 684b5f94d..65de776ea 100644 --- a/test-integration/samples/oauth-with-oracle-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/oauth-with-oracle-app/.yo-rc.json @@ -18,17 +18,10 @@ "jhiPrefix": "jhi", "entitySuffix": "", "dtoSuffix": "DTO", - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "enableTranslation": false, "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/.blueprint/generate-sample/templates/samples/oauth-with-postgres-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/oauth-with-postgres-app/.yo-rc.json new file mode 100644 index 000000000..dbf066bdc --- /dev/null +++ b/.blueprint/generate-sample/templates/samples/oauth-with-postgres-app/.yo-rc.json @@ -0,0 +1,31 @@ +{ + "generator-jhipster": { + "namespace": "JhipsterSampleApplication", + "databaseType": "postgresql", + "prodDatabaseType": "mysql", + "authenticationType": "oauth2", + "serverPort": "5000", + "jhipsterVersion": "7.9.3", + "applicationType": "monolith", + "baseName": "JhipsterSampleApplication", + "useSass": true, + "clientPackageManager": "npm", + "clientFramework": "angularX", + "clientTheme": "none", + "clientThemeVariant": "", + "creationTimestamp": 1587112984699, + "testFrameworks": [], + "jhiPrefix": "jhi", + "entitySuffix": "", + "dtoSuffix": "DTO", + "enableTranslation": false, + "blueprints": [ + { + "name": "generator-jhipster-dotnetcore" + } + ] + }, + "generator-jhipster-dotnetcore": { + "ciType": "Github" + } +} diff --git a/test-integration/samples/oauth-with-react-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/oauth-with-react-app/.yo-rc.json similarity index 78% rename from test-integration/samples/oauth-with-react-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/oauth-with-react-app/.yo-rc.json index e88a2d78e..e9ef58aa2 100644 --- a/test-integration/samples/oauth-with-react-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/oauth-with-react-app/.yo-rc.json @@ -18,17 +18,10 @@ "jhiPrefix": "jhi", "entitySuffix": "", "dtoSuffix": "DTO", - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "enableTranslation": false, "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/oauth-with-sqllite-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/oauth-with-sqllite-app/.yo-rc.json similarity index 78% rename from test-integration/samples/oauth-with-sqllite-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/oauth-with-sqllite-app/.yo-rc.json index 8bff65776..47e22e129 100644 --- a/test-integration/samples/oauth-with-sqllite-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/oauth-with-sqllite-app/.yo-rc.json @@ -18,16 +18,9 @@ "jhiPrefix": "jhi", "entitySuffix": "", "dtoSuffix": "DTO", - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "blueprints": [ { - "name": "generator-jhipster-dotnetcore", - "version": "2.0.0" + "name": "generator-jhipster-dotnetcore" } ] }, diff --git a/test-integration/samples/oauth-with-vue-app/.yo-rc.json b/.blueprint/generate-sample/templates/samples/oauth-with-vue-app/.yo-rc.json similarity index 87% rename from test-integration/samples/oauth-with-vue-app/.yo-rc.json rename to .blueprint/generate-sample/templates/samples/oauth-with-vue-app/.yo-rc.json index ddedcdfc9..d6d68446b 100644 --- a/test-integration/samples/oauth-with-vue-app/.yo-rc.json +++ b/.blueprint/generate-sample/templates/samples/oauth-with-vue-app/.yo-rc.json @@ -18,12 +18,6 @@ "jhiPrefix": "jhi", "entitySuffix": "", "dtoSuffix": "DTO", - "otherModules": [ - { - "name": "generator-jhipster-dotnetcore", - "version": "3.9.1" - } - ], "enableTranslation": false, "blueprints": [ { diff --git a/.editorconfig b/.editorconfig index ce53ec385..4d13f069f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,17 +1,20 @@ +# EditorConfig helps developers define and maintain consistent +# coding styles between different editors and IDEs # editorconfig.org + root = true [*] -indent_style = space -indent_size = 4 + +# We recommend you to keep these unchanged end_of_line = lf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true -[*.md] -trim_trailing_whitespace = false - -[{package,bower}.json] +# Change these settings to your own preference indent_style = space indent_size = 2 + +[*.md] +trim_trailing_whitespace = false diff --git a/.eslintignore b/.eslintignore index 2dbb56c98..e5bcf8fb0 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,6 +1,5 @@ -coverage -generators/**/templates -node_modules -travis -docs -generators/client/** +*.back.js +**/heroku/** +**/entity/** +**/ci-cd/** +**/client/*.cjs diff --git a/.eslintrc.json b/.eslintrc.json index 4992429dc..93fe8eecc 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,44 +1,45 @@ { - "env": { - "node": true, - "es6": true - }, - "extends": ["airbnb-base", "plugin:prettier/recommended"], - "rules": { - "default-param-last": "off", - "prettier/prettier": "error", - "prefer-regex-literals": "off", - "linebreak-style": 0, - "eol-last": 2, - "quotes": [2, "single", { "avoidEscape": true }], - "semi": [2, "always"], - "eqeqeq": [2, "smart"], - "no-restricted-globals": ["off"], - "no-use-before-define": [2, "nofunc"], - "no-confusing-arrow": "off", - "no-unused-vars": [2, { "vars": "local", "args": "none" }], - "no-multi-str": 2, - "no-irregular-whitespace": 2, - "no-restricted-exports": "off", - "comma-dangle": "off", - "max-len": "off", - "func-names": "off", - "class-methods-use-this": "off", - "no-underscore-dangle": "off", - "no-plusplus": "off", - "no-unused-expressions": [2, { "allowShortCircuit": true, "allowTernary": true }], - "prefer-destructuring": "off", - "no-console": "off", - "no-multi-assign": "off", - "no-param-reassign": "off", - "no-shadow": "off", - "no-promise-executor-return": "off", - "import/extensions": [0, { "pattern": { "{c,m,}js": "always" } }] - }, - "overrides": [ - { - "files": ["test/**/*.js"], - "env": { "mocha": true } - } - ] + "env": { + "node": true, + "es2022": true + }, + "extends": ["eslint:recommended", "airbnb-base", "plugin:prettier/recommended"], + "parserOptions": { + "ecmaVersion": 13, + "sourceType": "module" + }, + "overrides": [ + { + "files": ["**/*.spec.{c,m,}js", "test/**/*.{c,m,}js"] + } + ], + "rules": { + "func-names": "off", + "import/prefer-default-export": "off", + "no-param-reassign": [ + "error", + { "props": true, "ignorePropertyModificationsFor": ["application", "source", "entity", "field", "relationship"] } + ], + "import/no-extraneous-dependencies": ["error", { "devDependencies": true }], + "import/no-unresolved": "off", + "import/extensions": "off", + "no-restricted-exports": ["error", { "restrictDefaultExports": { "defaultFrom": false } }], + "no-await-in-loop": "off", + "no-restricted-syntax": [ + "error", + { + "selector": "ForInStatement", + "message": "for..in loops iterate over the entire prototype chain, which is virtually never what you want. Use Object.{keys,values,entries}, and iterate over the resulting array." + }, + { + "selector": "LabeledStatement", + "message": "Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand." + }, + { + "selector": "WithStatement", + "message": "`with` is disallowed in strict mode because it makes code impossible to predict and optimize." + } + ], + "no-shadow": "off" + } } diff --git a/.gitattributes b/.gitattributes index ff453f8b8..ca61722de 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,35 +1,150 @@ -# All text files should have the "lf" (Unix) line endings -* text eol=lf - -# Explicitly declare text files you want to always be normalized and converted -# to native line endings on checkout. -*.java text -*.js text -*.css text -*.html text -*.cs text - -# Denote all files that are truly binary and should not be modified. -*.png binary -*.jpg binary -*.jar binary -*.pdf binary -*.eot binary -*.ttf binary -*.gzip binary -*.gz binary -*.ai binary -*.eps binary - -# Precise which language is used -*.ts.ejs linguist-language=TypeScript -*.tsx.ejs linguist-language=TypeScript -*.js.ejs linguist-language=JavaScript -*.cs.ejs linguist-language=CSharp -*.ps1.ejs linguist-language=PowerShell -*.css.ejs linguist-language=CSS -*.scss.ejs linguist-language=SCSS -*.yaml.ejs linguist-language=YAML -*.yml.ejs linguist-language=YAML -*.json.ejs linguist-language=JSON -*.xml.ejs linguist-language=XML \ No newline at end of file +# This file is inspired by https://github.com/alexkaratarakis/gitattributes +# +# Auto detect text files and perform LF normalization +# http://davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/ +* text=auto + +# The above will handle all files NOT found below +# These files are text and should be normalized (Convert crlf => lf) + +*.bat text eol=crlf +*.cmd text eol=crlf +*.ps1 text eol=crlf +*.coffee text +*.css text +*.cql text +*.df text +*.ejs text +*.html text +*.java text +*.js text +*.json text +*.less text +*.properties text +*.sass text +*.scss text +*.sh text eol=lf +*.sql text +*.txt text +*.ts text +*.xml text +*.yaml text +*.yml text + +# Documents +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain +*.markdown text +*.md text +*.adoc text +*.textile text +*.mustache text +*.csv text +*.tab text +*.tsv text +*.txt text +AUTHORS text +CHANGELOG text +CHANGES text +CONTRIBUTING text +COPYING text +copyright text +*COPYRIGHT* text +INSTALL text +license text +LICENSE text +NEWS text +readme text +*README* text +TODO text + +# Graphics +*.png binary +*.jpg binary +*.jpeg binary +*.gif binary +*.tif binary +*.tiff binary +*.ico binary +# SVG treated as an asset (binary) by default. If you want to treat it as text, +# comment-out the following line and uncomment the line after. +*.svg binary +#*.svg text +*.eps binary + +# These files are binary and should be left untouched +# (binary is a macro for -text -diff) +*.class binary +*.jar binary +*.war binary + +## LINTERS +.csslintrc text +.eslintrc text +.jscsrc text +.jshintrc text +.jshintignore text +.stylelintrc text + +## CONFIGS +*.conf text +*.config text +.editorconfig text +.gitattributes text +.gitconfig text +.gitignore text +.htaccess text +*.npmignore text + +## HEROKU +Procfile text +.slugignore text + +## AUDIO +*.kar binary +*.m4a binary +*.mid binary +*.midi binary +*.mp3 binary +*.ogg binary +*.ra binary + +## VIDEO +*.3gpp binary +*.3gp binary +*.as binary +*.asf binary +*.asx binary +*.fla binary +*.flv binary +*.m4v binary +*.mng binary +*.mov binary +*.mp4 binary +*.mpeg binary +*.mpg binary +*.swc binary +*.swf binary +*.webm binary + +## ARCHIVES +*.7z binary +*.gz binary +*.rar binary +*.tar binary +*.zip binary + +## FONTS +*.ttf binary +*.eot binary +*.otf binary +*.woff binary +*.woff2 binary diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 3663880aa..3a18c8c16 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -52,7 +52,7 @@ If you are using JDL, please share that configuration as well. -- [ ] Checking this box is mandatory (this is just to show you read everything) +- [ ] Checking this box is mandatory (this is just to show you read everything) diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md index 0b1d32328..ace6d8aad 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md @@ -65,7 +65,7 @@ If you are using JDL, please share that configuration as well. -- [ ] Checking this box is mandatory (this is just to show you read everything) +- [ ] Checking this box is mandatory (this is just to show you read everything) diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md index e45a67828..cb59fcf9d 100644 --- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md +++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md @@ -15,7 +15,7 @@ about: Suggest an improvement. -- [ ] Checking this box is mandatory (this is just to show you read everything) +- [ ] Checking this box is mandatory (this is just to show you read everything) diff --git a/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md b/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md index a4e0136cc..cfe174ac6 100644 --- a/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md +++ b/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md @@ -8,6 +8,6 @@ about: If you have a question, please use StackOverflow! We primarily use GitHub as an issue tracker, if your issue is not a **bug** or **feature request** then sorry you are not in the right place :wink:. **If you have a question** please use Stack Overflow, and tag the question with [jhipster](http://stackoverflow.com/questions/tagged/jhipster). This will help the project to keep a clean issue tracker. Also, Stack Overflow will give your question a larger audience: -- This will increase your chances to get an answer -- Answers will be of higher quality, as there is a voting system -- This will also help other users who might have the same issue, as questions are tagged and easily searchable +- This will increase your chances to get an answer +- Answers will be of higher quality, as there is a voting system +- This will also help other users who might have the same issue, as questions are tagged and easily searchable diff --git a/.github/MAINTAINERS_REPLY_TEMPLATES/DONT_COMMENT_ON_OLD_ISSUE.md b/.github/MAINTAINERS_REPLY_TEMPLATES/DONT_COMMENT_ON_OLD_ISSUE.md index 02e5447e3..97a9f695d 100644 --- a/.github/MAINTAINERS_REPLY_TEMPLATES/DONT_COMMENT_ON_OLD_ISSUE.md +++ b/.github/MAINTAINERS_REPLY_TEMPLATES/DONT_COMMENT_ON_OLD_ISSUE.md @@ -3,8 +3,8 @@ If you think this issue still applies, please [create a new ticket](https://gith **If you have a question** please use Stack Overflow, and tag the question with [jhipster](http://stackoverflow.com/questions/tagged/jhipster). This helps the project to keep the issue tracker clean. Also, Stack Overflow will give your question a larger audience: -- This will increase your chances to get an answer -- Answers will be of higher quality, as there is a voting system -- This will also help other users who might have the same issue, as questions are tagged and easily searchable +- This will increase your chances to get an answer +- Answers will be of higher quality, as there is a voting system +- This will also help other users who might have the same issue, as questions are tagged and easily searchable Finally, you can also use [our chat room on gitter](https://gitter.im/jhipster/generator-jhipster). diff --git a/.github/MAINTAINERS_REPLY_TEMPLATES/GUIDELINES_NOT_FOLLOWED.md b/.github/MAINTAINERS_REPLY_TEMPLATES/GUIDELINES_NOT_FOLLOWED.md index 3bcd8d6e2..e63a2e9a3 100644 --- a/.github/MAINTAINERS_REPLY_TEMPLATES/GUIDELINES_NOT_FOLLOWED.md +++ b/.github/MAINTAINERS_REPLY_TEMPLATES/GUIDELINES_NOT_FOLLOWED.md @@ -13,8 +13,8 @@ Issues opened without proper details will be closed without explanation. **If you have a question** please use Stack Overflow, and tag the question with [jhipster](http://stackoverflow.com/questions/tagged/jhipster). This helps the project to keep the issue tracker clean. Also, Stack Overflow will give your question a larger audience: -- This will increase your chances to get an answer -- Answers will be of higher quality, as there is a voting system -- This will also help other users who might have the same issue, as questions are tagged and easily searchable +- This will increase your chances to get an answer +- Answers will be of higher quality, as there is a voting system +- This will also help other users who might have the same issue, as questions are tagged and easily searchable Finally, you can also use [our chat room on gitter](https://gitter.im/jhipster/generator-jhipster). diff --git a/.github/MAINTAINERS_REPLY_TEMPLATES/README.md b/.github/MAINTAINERS_REPLY_TEMPLATES/README.md index cc202f00f..7769fb33f 100644 --- a/.github/MAINTAINERS_REPLY_TEMPLATES/README.md +++ b/.github/MAINTAINERS_REPLY_TEMPLATES/README.md @@ -4,7 +4,7 @@ Here is a list of common **reply messages** shared by core team members to help You can add those to your [Github saved replies settings](https://github.com/settings/replies). -- [Guidelines are not followed](GUIDELINES_NOT_FOLLOWED.md) -- [Use Stack Overflow](USE_STACK_OVERFLOW.md) -- [Don't comment on an old issue](DONT_COMMENT_ON_OLD_ISSUE.md) -- [Build as a module](BUILD_AS_MODULE.md) +- [Guidelines are not followed](GUIDELINES_NOT_FOLLOWED.md) +- [Use Stack Overflow](USE_STACK_OVERFLOW.md) +- [Don't comment on an old issue](DONT_COMMENT_ON_OLD_ISSUE.md) +- [Build as a module](BUILD_AS_MODULE.md) diff --git a/.github/MAINTAINERS_REPLY_TEMPLATES/USE_STACK_OVERFLOW.md b/.github/MAINTAINERS_REPLY_TEMPLATES/USE_STACK_OVERFLOW.md index fefa301c9..e66c44530 100644 --- a/.github/MAINTAINERS_REPLY_TEMPLATES/USE_STACK_OVERFLOW.md +++ b/.github/MAINTAINERS_REPLY_TEMPLATES/USE_STACK_OVERFLOW.md @@ -1,8 +1,8 @@ This is not a **bug** or **feature request** and hence this is not the correct forum for this. **If you have a question** please use Stack Overflow, and tag the question with [jhipster](http://stackoverflow.com/questions/tagged/jhipster). This will help the project to keep a clean issue tracker. Also, Stack Overflow will give your question a larger audience: -- This will increase your chances to get an answer -- Answers will be of higher quality, as there is a voting system -- This will also help other users who might have the same issue, as questions are tagged and easily searchable +- This will increase your chances to get an answer +- Answers will be of higher quality, as there is a voting system +- This will also help other users who might have the same issue, as questions are tagged and easily searchable Finally, you can also use [our chat room on gitter](https://gitter.im/jhipster/generator-jhipster). diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 987e55075..7a20d15bb 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,9 +1,9 @@ -- Please make sure the below checklist is followed for Pull Requests. +- Please make sure the below checklist is followed for Pull Requests. -- [ ] [All continuous integration tests](https://github.com/jhipster/generator-jhipster/actions) are green -- [ ] Tests are added where necessary -- [ ] Documentation is added/updated where necessary -- [ ] Coding Rules & Commit Guidelines as per our [CONTRIBUTING.md document](https://github.com/jhipster/generator-jhipster/blob/main/CONTRIBUTING.md) are followed +- [ ] [All continuous integration tests](https://github.com/jhipster/generator-jhipster/actions) are green +- [ ] Tests are added where necessary +- [ ] Documentation is added/updated where necessary +- [ ] Coding Rules & Commit Guidelines as per our [CONTRIBUTING.md document](https://github.com/jhipster/generator-jhipster/blob/main/CONTRIBUTING.md) are followed