fix jhipster v7.4.x compatibility and prettier differences

jhipster · Dec 7, 2021 · dfe6d4b · dfe6d4b
1 parent 0ede59f
commit dfe6d4b
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 24 deletions.
diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jhipster_version: [7.3.1, 6]
+        jhipster_version: [7, 6]
         node_version: [14.x]
         app_type:
           - JwtDtoWebsocketsApp

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jhipster_version: [7.3.1]
+        jhipster_version: [7]
         node_version: [14.x]
         app_type:
           - JwtDtoApp

diff --git a/.github/workflows/sample-app.yml b/.github/workflows/sample-app.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jhipster_version: [7.3.1]
+        jhipster_version: [7]
         node_version: [14.15.0]
         os: [ubuntu-latest]
     env:

diff --git a/generators/app/index.js b/generators/app/index.js
@@ -19,13 +19,7 @@ const {
 
 module.exports = class extends AppGenerator {
   constructor(args, opts) {
-    super(args, { fromBlueprint: true, ...opts }); // fromBlueprint variable is important
-
-    const jhContext = (this.jhipsterContext = this.options.jhipsterContext);
-
-    if (!jhContext) {
-      this.error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints react-native')}`);
-    }
+    super(args, { fromBlueprint: true, skipClient: false, ...opts }); // fromBlueprint variable is important
 
     this.patchInFile = patchInFile.bind(this);
     if (!this.context) {
@@ -36,7 +30,6 @@ module.exports = class extends AppGenerator {
     // this does not look to be configurable from blueprints (see getPrettierExtensions in generator-base.js)
     // skipClient has no effect for generator-jhipster-react-native since it only generates a client
     this.skipClient = false;
-    this.jhipsterConfig.skipClient = false;
   }
 
   get initializing() {

diff --git a/generators/entity/index.js b/generators/entity/index.js
@@ -31,7 +31,6 @@ module.exports = class extends EntityGenerator {
     // this does not look to be configurable from blueprints (see getPrettierExtensions in generator-base.js)
     // skipClient has no effect for generator-jhipster-react-native since it only generates a client
     this.skipClient = false;
-    this.jhipsterConfig.skipClient = false;
   }
 
   get initializing() {

diff --git a/package-lock.json b/package-lock.json