generator-jhipster 7.5.0 → 7.6.0

package/jdl/validators/binary-option-validator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/jdl/validators/deployment-validator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/jdl/validators/entity-validator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/jdl/validators/enum-validator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/jdl/validators/field-validator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/jdl/validators/jdl-with-application-validator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/jdl/validators/jdl-without-application-validator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/jdl/validators/option-validator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/jdl/validators/relationship-validator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/jdl/validators/unary-option-validator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/jdl/validators/validation-validator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/jdl/validators/validator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/lib/constants/generators.mjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/lib/constants/priorities.cjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.
@@ -18,81 +18,120 @@
  */
 
 const PRIORITY_PREFIX = '>';
+const QUEUE_PREFIX = 'jhipster:';
 
+/** Yeoman priorities */
 const INITIALIZING = 'initializing';
+const INITIALIZING_PRIORITY = `${PRIORITY_PREFIX}${INITIALIZING}`;
+
 const PROMPTING = 'prompting';
+const PROMPTING_PRIORITY = `${PRIORITY_PREFIX}${PROMPTING}`;
+
 const CONFIGURING = 'configuring';
+const CONFIGURING_PRIORITY = `${PRIORITY_PREFIX}${CONFIGURING}`;
+
+const DEFAULT = 'default';
+const DEFAULT_PRIORITY = `${PRIORITY_PREFIX}${DEFAULT}`;
+
+const WRITING = 'writing';
+const WRITING_PRIORITY = `${PRIORITY_PREFIX}${WRITING}`;
+
+const CONFLICTS = 'conflicts';
+
+const INSTALL = 'install';
+const INSTALL_PRIORITY = `${PRIORITY_PREFIX}${INSTALL}`;
+
+const END = 'end';
+const END_PRIORITY = `${PRIORITY_PREFIX}${END}`;
+
+/** Custom priorities */
 const COMPOSING = 'composing';
+const COMPOSING_PRIORITY = `${PRIORITY_PREFIX}${COMPOSING}`;
+const COMPOSING_QUEUE = `${QUEUE_PREFIX}${COMPOSING}`;
+
 const LOADING = 'loading';
+const LOADING_PRIORITY = `${PRIORITY_PREFIX}${LOADING}`;
+const LOADING_QUEUE = `${QUEUE_PREFIX}${LOADING}`;
+
 const PREPARING = 'preparing';
+const PREPARING_PRIORITY = `${PRIORITY_PREFIX}${PREPARING}`;
+const PREPARING_QUEUE = `${QUEUE_PREFIX}${PREPARING}`;
+
 const PREPARING_FIELDS = 'preparingFields';
+const PREPARING_FIELDS_PRIORITY = `${PRIORITY_PREFIX}${PREPARING_FIELDS}`;
+const PREPARING_FIELDS_QUEUE = `${QUEUE_PREFIX}${PREPARING_FIELDS}`;
+
 const PREPARING_RELATIONSHIPS = 'preparingRelationships';
-const DEFAULT = 'default';
-const WRITING = 'writing';
-const CONFLICTS = 'conflicts';
+const PREPARING_RELATIONSHIPS_PRIORITY = `${PRIORITY_PREFIX}${PREPARING_RELATIONSHIPS}`;
+const PREPARING_RELATIONSHIPS_QUEUE = `${QUEUE_PREFIX}${PREPARING_RELATIONSHIPS}`;
+
 const POST_WRITING = 'postWriting';
-const INSTALL = 'install';
-const END = 'end';
+const POST_WRITING_PRIORITY = `${PRIORITY_PREFIX}${POST_WRITING}`;
+const POST_WRITING_QUEUE = `${QUEUE_PREFIX}${POST_WRITING}`;
 
-// Private priority
+/** @private */
 const PRE_CONFLICTS = 'preConflicts';
+/** @private */
+const PRE_CONFLICTS_PRIORITY = `${PRIORITY_PREFIX}${PRE_CONFLICTS}`;
+/** @private */
+const PRE_CONFLICTS_QUEUE = `${QUEUE_PREFIX}${PRE_CONFLICTS}`;
 
-const INITIALIZING_PRIORITY = `${PRIORITY_PREFIX}initializing`;
-const PROMPTING_PRIORITY = `${PRIORITY_PREFIX}prompting`;
-const CONFIGURING_PRIORITY = `${PRIORITY_PREFIX}configuring`;
-const COMPOSING_PRIORITY = `${PRIORITY_PREFIX}composing`;
-const LOADING_PRIORITY = `${PRIORITY_PREFIX}loading`;
-const PREPARING_PRIORITY = `${PRIORITY_PREFIX}preparing`;
-const PREPARING_FIELDS_PRIORITY = `${PRIORITY_PREFIX}preparingFields`;
-const PREPARING_RELATIONSHIPS_PRIORITY = `${PRIORITY_PREFIX}preparingRelationships`;
-const DEFAULT_PRIORITY = `${PRIORITY_PREFIX}default`;
-const WRITING_PRIORITY = `${PRIORITY_PREFIX}writing`;
-const PRE_CONFLICTS_PRIORITY = `${PRIORITY_PREFIX}preConflicts`;
-const POST_WRITING_PRIORITY = `${PRIORITY_PREFIX}postWriting`;
-const INSTALL_PRIORITY = `${PRIORITY_PREFIX}install`;
-const END_PRIORITY = `${PRIORITY_PREFIX}end`;
-
-// Reverse order
 /**
  * Custom priorities to improve jhipster workflow.
  */
 const CUSTOM_PRIORITIES = [
   {
-    priorityName: PRE_CONFLICTS,
-    queueName: `jhipster:${PRE_CONFLICTS}`,
-    before: CONFLICTS,
+    priorityName: COMPOSING,
+    queueName: COMPOSING_QUEUE,
+    before: LOADING,
   },
   {
-    priorityName: POST_WRITING,
-    queueName: `jhipster:${POST_WRITING}`,
-    before: PRE_CONFLICTS,
+    priorityName: LOADING,
+    queueName: LOADING_QUEUE,
+    before: PREPARING,
   },
   {
-    priorityName: PREPARING_RELATIONSHIPS,
-    queueName: `jhipster:${PREPARING_RELATIONSHIPS}`,
-    before: DEFAULT,
+    priorityName: PREPARING,
+    queueName: PREPARING_QUEUE,
+    before: PREPARING_FIELDS,
   },
   {
     priorityName: PREPARING_FIELDS,
-    queueName: `jhipster:${PREPARING_FIELDS}`,
+    queueName: PREPARING_FIELDS_QUEUE,
     before: PREPARING_RELATIONSHIPS,
   },
   {
-    priorityName: PREPARING,
-    queueName: `jhipster:${PREPARING}`,
-    before: PREPARING_FIELDS,
+    priorityName: PREPARING_RELATIONSHIPS,
+    queueName: PREPARING_RELATIONSHIPS_QUEUE,
+    before: DEFAULT,
   },
   {
-    priorityName: LOADING,
-    queueName: `jhipster:${LOADING}`,
-    before: PREPARING,
+    priorityName: POST_WRITING,
+    queueName: POST_WRITING_QUEUE,
+    before: PRE_CONFLICTS,
   },
   {
-    priorityName: COMPOSING,
-    queueName: `jhipster:${COMPOSING}`,
-    before: LOADING,
+    priorityName: PRE_CONFLICTS,
+    queueName: PRE_CONFLICTS_QUEUE,
+    before: CONFLICTS,
   },
-];
+].reverse();
+
+const compat = {
+  INITIALIZING_PRIORITY: INITIALIZING,
+  PROMPTING_PRIORITY: PROMPTING,
+  CONFIGURING_PRIORITY: CONFIGURING,
+  COMPOSING_PRIORITY: COMPOSING,
+  LOADING_PRIORITY: LOADING,
+  PREPARING_PRIORITY: PREPARING,
+  PREPARING_FIELDS_PRIORITY: PREPARING_FIELDS,
+  PREPARING_RELATIONSHIPS_PRIORITY: PREPARING_RELATIONSHIPS,
+  DEFAULT_PRIORITY: DEFAULT,
+  WRITING_PRIORITY: WRITING,
+  POST_WRITING_PRIORITY: POST_WRITING,
+  INSTALL_PRIORITY: INSTALL,
+  END_PRIORITY: END,
+};
 
 const PRIORITY_NAMES = [
   INITIALIZING,
@@ -112,6 +151,10 @@ const PRIORITY_NAMES = [
 
 module.exports = {
   PRIORITY_PREFIX,
+  CUSTOM_PRIORITIES,
+  PRIORITY_NAMES,
+  compat,
+
   INITIALIZING_PRIORITY,
   PROMPTING_PRIORITY,
   CONFIGURING_PRIORITY,
@@ -126,6 +169,4 @@ module.exports = {
   PRE_CONFLICTS_PRIORITY,
   INSTALL_PRIORITY,
   END_PRIORITY,
-  CUSTOM_PRIORITIES,
-  PRIORITY_NAMES,
 };

package/lib/constants/priorities.mjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/lib/support/index.cjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/lib/support/mixin.cjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.
@@ -117,6 +117,7 @@ module.exports.generateMixedChain = (...generators) => {
       return {};
     }
   };
+
   mixedChain.forEach(generator => {
     // eslint-disable-next-line import/no-dynamic-require,global-require
     const { mixin } = require(`../../generators/${generator}/mixin.cjs`);

package/lib/support/shared-data.cjs

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-jhipster",
-  "version": "7.5.0",
+  "version": "7.6.0",
   "description": "Spring Boot + Angular/React/Vue in one handy generator",
   "keywords": [
     "yeoman-generator",
@@ -80,10 +80,10 @@
     "update-snapshots": "npm run update-snapshot -- test generators"
   },
   "dependencies": {
-    "aws-sdk": "2.1048.0",
-    "axios": "0.24.0",
+    "aws-sdk": "2.1062.0",
+    "axios": "0.25.0",
     "chalk": "4.1.2",
-    "chevrotain": "9.1.0",
+    "chevrotain": "10.0.0",
     "commander": "8.3.0",
     "conf": "10.1.1",
     "debug": "4.3.3",
@@ -103,34 +103,34 @@
     "parse-gitignore": "1.0.1",
     "pluralize": "8.0.0",
     "prettier": "2.5.1",
-    "prettier-plugin-java": "1.6.0",
+    "prettier-plugin-java": "1.6.1",
     "prettier-plugin-packagejson": "2.2.15",
     "progress": "2.0.3",
     "randexp": "0.5.3",
     "semver": "7.3.5",
-    "shelljs": "0.8.4",
-    "simple-git": "2.48.0",
+    "shelljs": "0.8.5",
+    "simple-git": "3.0.3",
     "then-request": "6.0.2",
     "uuid": "8.3.2",
-    "winston": "3.3.3",
-    "yeoman-environment": "3.8.1",
-    "yeoman-generator": "5.4.2"
+    "winston": "3.4.0",
+    "yeoman-environment": "3.9.1",
+    "yeoman-generator": "5.6.1"
   },
   "devDependencies": {
     "chai": "4.3.4",
     "ejs-lint": "1.2.1",
-    "eslint": "8.5.0",
+    "eslint": "8.7.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-chai-friendly": "^0.7.1",
-    "eslint-plugin-import": "2.25.3",
+    "eslint-plugin-import": "2.25.4",
     "eslint-plugin-mocha": "10.0.3",
     "eslint-plugin-prettier": "4.0.0",
-    "expect": "27.4.2",
+    "expect": "27.4.6",
     "fs-extra": "10.0.0",
     "jsdoc": "3.6.7",
-    "mocha": "9.1.3",
-    "mocha-expect-snapshot": "1.1.1",
+    "mocha": "9.1.4",
+    "mocha-expect-snapshot": "2.1.0",
     "proxyquire": "2.1.3",
     "sinon": "12.0.1",
     "sinon-chai": "3.7.0",

package/utils/blueprint.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/utils/db.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/utils/entity.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/utils/faker.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/utils/field.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/utils/index.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/utils/language.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/utils/liquibase.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/utils/relationship.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2021 the original author or authors from the JHipster project.
+ * Copyright 2013-2022 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.

package/generators/server/templates/src/test/java/package/ArchTest.java.ejs

@@ -1,47 +0,0 @@
-<%#
- Copyright 2013-2021 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.
--%>
-package <%= packageName %>;
-
-import com.tngtech.archunit.core.domain.JavaClasses;
-import com.tngtech.archunit.core.importer.ClassFileImporter;
-import com.tngtech.archunit.core.importer.ImportOption;
-import org.junit.jupiter.api.Test;
-
-import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
-
-class ArchTest {
-
-    @Test
-    void servicesAndRepositoriesShouldNotDependOnWebLayer() {
-
-        JavaClasses importedClasses = new ClassFileImporter()
-            .withImportOption(ImportOption.Predefined.DO_NOT_INCLUDE_TESTS)
-            .importPackages("<%= packageName %>");
-
-        noClasses()
-            .that()
-                .resideInAnyPackage("<%= packageName %>.service..")
-            .or()
-                .resideInAnyPackage("<%= packageName %>.repository..")
-            .should().dependOnClassesThat()
-                .resideInAnyPackage("..<%= packageName %>.web..")
-        .because("Services and repositories should not depend on web layer")
-        .check(importedClasses);
-    }
-}