Merge pull request #21082 from mshima/skip_ci-force-yo

don't load manually written config file to mem-fs
jhipster · Feb 12, 2023 · 3424cec · 3424cec
2 parents 8eb4892 + d4f0557
commit 3424cec
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 80 deletions.
diff --git a/generators/bootstrap/generator.mts b/generators/bootstrap/generator.mts
@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import memFsEditor from 'mem-fs-editor';
 import environmentTransfrom from 'yeoman-environment/transform';
 import { transform } from 'p-transform';
 import { stat } from 'fs/promises';
@@ -46,9 +45,6 @@ const {
   patternSpy,
 } = environmentTransfrom;
 
-const { State } = memFsEditor as any;
-const { hasState, setModifiedFileState } = State;
-
 const TRANSFORM_PRIORITY = BaseGenerator.asPriority(TRANSFORM);
 const PRE_CONFLICTS_PRIORITY = BaseGenerator.asPriority(PRE_CONFLICTS);
 
@@ -181,17 +177,7 @@ export default class BootstrapGenerator extends BaseGenerator {
     const { withGeneratedFlag, autoCrlf } = this.jhipsterConfig;
     const env: any = this.env;
 
-    // JDL writes directly to disk, set the file as modified so prettier will be applied
     const { ignoreErrors } = this.options;
-    if (!this.upgradeCommand) {
-      stream = stream.pipe(
-        patternSpy((file: any) => {
-          if (file.contents && !hasState(file) && !this.options.reproducibleTests) {
-            setModifiedFileState(file);
-          }
-        }, '**/{.yo-rc.json,.jhipster/*.json}').name('jhipster:config-files:modify')
-      );
-    }
 
     const conflicterStatus = {
       fileActions: [

diff --git a/test/__snapshots__/openapi-client.spec.mts.snap b/test/__snapshots__/openapi-client.spec.mts.snap
@@ -6,36 +6,6 @@ exports[`generator - OpenAPI Client Spring: microservice petstore custom endpoin
     "contents": "pom.xml
 README.md
 package.json
-",
-    "stateCleared": "modified",
-  },
-  ".yo-rc.json": {
-    "contents": "{
-  "generator-jhipster": {
-    "applicationType": "microservice",
-    "baseName": "sampleOpenApiClient",
-    "packageName": "com.mycompany.myapp",
-    "packageFolder": "com/mycompany/myapp",
-    "serverPort": "8081",
-    "authenticationType": "jwt",
-    "cacheProvider": "ehcache",
-    "enableHibernateCache": true,
-    "websocket": "no",
-    "databaseType": "sql",
-    "devDatabaseType": "h2Memory",
-    "prodDatabaseType": "mysql",
-    "searchEngine": "no",
-    "messageBroker": "no",
-    "serviceDiscoveryType": "consul",
-    "buildTool": "maven",
-    "enableSwaggerCodegen": true,
-    "jwtSecretKey": "Y2Q4NzYwMzEwMzNiZTExYzI1Y2E2Yjg2MGViNjRjMGE2YjcwNTEzY2ZkMDgxNTYwNTUxZWJjMzJhYjUwY2JiOTBiNjk3YWExMWRiNWM0MDljOTJhN2M2ODBkZDY5MjQ4MTVhYmUyZGUwYjFiODE1YmFhMTE0MjY2NDRiZDI5NDI=",
-    "testFrameworks": [],
-    "enableTranslation": false,
-    "skipClient": true,
-    "skipUserManagement": true
-  }
-}
 ",
     "stateCleared": "modified",
   },
@@ -60,42 +30,6 @@ exports[`generator - OpenAPI Client Spring: microservice petstore regenerate  sh
     "contents": "pom.xml
 README.md
 package.json
-",
-    "stateCleared": "modified",
-  },
-  ".yo-rc.json": {
-    "contents": "{
-  "generator-jhipster": {
-    "applicationType": "microservice",
-    "baseName": "sampleOpenApiClient",
-    "packageName": "com.mycompany.myapp",
-    "packageFolder": "com/mycompany/myapp",
-    "serverPort": "8081",
-    "authenticationType": "jwt",
-    "cacheProvider": "ehcache",
-    "enableHibernateCache": true,
-    "websocket": "no",
-    "databaseType": "sql",
-    "devDatabaseType": "h2Memory",
-    "prodDatabaseType": "mysql",
-    "searchEngine": "no",
-    "messageBroker": "no",
-    "serviceDiscoveryType": "consul",
-    "buildTool": "maven",
-    "enableSwaggerCodegen": true,
-    "jwtSecretKey": "Y2Q4NzYwMzEwMzNiZTExYzI1Y2E2Yjg2MGViNjRjMGE2YjcwNTEzY2ZkMDgxNTYwNTUxZWJjMzJhYjUwY2JiOTBiNjk3YWExMWRiNWM0MDljOTJhN2M2ODBkZDY5MjQ4MTVhYmUyZGUwYjFiODE1YmFhMTE0MjY2NDRiZDI5NDI=",
-    "testFrameworks": [],
-    "enableTranslation": false,
-    "skipClient": true,
-    "skipUserManagement": true,
-    "openApiClients": {
-      "petstore": {
-        "spec": "petstore-openapi-3.yml",
-        "generatorName": "spring"
-      }
-    }
-  }
-}
 ",
     "stateCleared": "modified",
   },