generator-jhipster 7.9.0 → 7.9.3

package/lib/constants/priorities.cjs

@@ -101,6 +101,10 @@ const POST_WRITING_ENTITIES = 'postWritingEntities';
 const POST_WRITING_ENTITIES_PRIORITY = `${PRIORITY_PREFIX}${POST_WRITING_ENTITIES}`;
 const POST_WRITING_ENTITIES_QUEUE = `${QUEUE_PREFIX}${POST_WRITING_ENTITIES}`;
 
+const POST_INSTALL = 'postInstall';
+const POST_INSTALL_PRIORITY = `${PRIORITY_PREFIX}${POST_INSTALL}`;
+const POST_INSTALL_QUEUE = `${QUEUE_PREFIX}${POST_INSTALL}`;
+
 /** @private */
 const PRE_CONFLICTS = 'preConflicts';
 /** @private */
@@ -168,6 +172,12 @@ const CUSTOM_PRIORITIES = [
     args: generator => generator.getArgsForPriority(INSTALL),
     edit: true,
   },
+  {
+    priorityName: POST_INSTALL,
+    queueName: POST_INSTALL_QUEUE,
+    before: END,
+    args: generator => generator.getArgsForPriority(POST_INSTALL),
+  },
   {
     priorityName: END,
     args: generator => generator.getArgsForPriority(END),
@@ -200,6 +210,7 @@ const compat = {
   POST_WRITING_ENTITIES_PRIORITY: POST_WRITING_ENTITIES,
   PRE_CONFLICTS_PRIORITY: PRE_CONFLICTS,
   INSTALL_PRIORITY: INSTALL,
+  POST_INSTALL_PRIORITY: POST_INSTALL,
   END_PRIORITY: END,
 };
 
@@ -227,6 +238,7 @@ const PRIORITY_NAMES = {
   POST_WRITING_ENTITIES,
   PRE_CONFLICTS,
   INSTALL,
+  POST_INSTALL,
   END,
 };
 
@@ -241,6 +253,7 @@ const BASE_PRIORITY_NAMES = [
   WRITING,
   POST_WRITING,
   INSTALL,
+  POST_INSTALL,
   END,
 ];
 
@@ -318,6 +331,7 @@ const QUEUES = {
   POST_WRITING_ENTITIES_QUEUE,
   PRE_CONFLICTS_QUEUE,
   INSTALL_QUEUE: INSTALL,
+  POST_INSTALL_QUEUE,
   END_QUEUE: END,
 };
 
@@ -334,6 +348,7 @@ const ENTITY_PRIORITY_NAMES = [
   WRITING,
   POST_WRITING,
   INSTALL,
+  POST_INSTALL,
   END,
 ];
 
@@ -382,5 +397,6 @@ module.exports = {
   POST_WRITING_ENTITIES_PRIORITY,
   PRE_CONFLICTS_PRIORITY,
   INSTALL_PRIORITY,
+  POST_INSTALL_PRIORITY,
   END_PRIORITY,
 };

package/lib/constants/priorities.mjs

@@ -43,5 +43,6 @@ export {
   POST_WRITING_ENTITIES_PRIORITY,
   PRE_CONFLICTS_PRIORITY,
   INSTALL_PRIORITY,
+  POST_INSTALL_PRIORITY,
   END_PRIORITY,
 } from './priorities.cjs';

package/lib/index.js

@@ -2,6 +2,7 @@ const constants = require('../generators/generator-constants');
 
 const GeneratorBase = require('../generators/generator-base');
 const GeneratorBaseBlueprint = require('../generators/generator-base-blueprint');
+const GeneratorBaseEntities = require('../generators/generator-base-entities.cjs');
 
 const AppGenerator = require('../generators/app');
 const ClientGenerator = require('../generators/client');
@@ -23,6 +24,7 @@ module.exports = {
 
   GeneratorBase,
   GeneratorBaseBlueprint,
+  GeneratorBaseEntities,
 
   AppGenerator,
   ClientGenerator,

package/lib/support/base.cjs

@@ -17,6 +17,7 @@
  * limitations under the License.
  */
 const { platform } = require('os');
+const { normalizeLineEndings } = require('../../generators/utils');
 
 const isWin32 = platform() === 'win32';
 
@@ -29,7 +30,7 @@ const isWin32 = platform() === 'win32';
 const joinCallbacks = (...callbacks) => {
   return function (content, filePath) {
     if (isWin32 && content.match(/\r\n/)) {
-      callbacks = [ct => ct.replace(/\r\n/g, '\n')].concat(callbacks).concat(ct => ct.replace(/\n/g, '\r\n'));
+      callbacks = [ct => normalizeLineEndings(ct, '\n')].concat(callbacks).concat(ct => normalizeLineEndings(ct, '\r\n'));
     }
     for (const callback of callbacks) {
       content = callback.call(this, content, filePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-jhipster",
-  "version": "7.9.0",
+  "version": "7.9.3",
   "description": "Spring Boot + Angular/React/Vue in one handy generator",
   "keywords": [
     "yeoman-generator",
@@ -84,10 +84,10 @@
   },
   "dependencies": {
     "@faker-js/faker": "5.5.3",
-    "aws-sdk": "2.1185.0",
+    "aws-sdk": "2.1204.0",
     "axios": "0.27.2",
     "chalk": "4.1.2",
-    "chevrotain": "10.1.2",
+    "chevrotain": "10.3.0",
     "commander": "9.4.0",
     "conf": "10.2.0",
     "debug": "4.3.4",
@@ -96,9 +96,10 @@
     "escape-string-regexp": "4.0.0",
     "glob": "8.0.3",
     "insight": "0.11.1",
+    "isbinaryfile": "4.0.10",
     "js-yaml": "4.1.0",
     "lodash": "4.17.21",
-    "mem-fs-editor": "9.4.0",
+    "mem-fs-editor": "9.5.0",
     "minimatch": "5.1.0",
     "normalize-path": "3.0.0",
     "os-locale": "5.0.0",
@@ -113,7 +114,7 @@
     "randexp": "0.5.3",
     "semver": "7.3.7",
     "shelljs": "0.8.5",
-    "simple-git": "3.11.0",
+    "simple-git": "3.13.0",
     "then-request": "6.0.2",
     "uuid": "8.3.2",
     "winston": "3.8.1",
@@ -123,7 +124,7 @@
   "devDependencies": {
     "chai": "4.3.6",
     "ejs-lint": "1.2.2",
-    "eslint": "8.20.0",
+    "eslint": "8.23.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-chai-friendly": "0.7.2",

package/utils/blueprint.js

@@ -16,6 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const YeomanNamespace = require('yeoman-environment/lib/util/namespace');
 
 module.exports = {
   mergeBlueprints,
@@ -134,6 +135,15 @@ function parseBlueprintInfo(blueprint) {
  * @returns {string} the normalized blueprint name
  */
 function normalizeBlueprintName(blueprint) {
+  try {
+    const parsed = YeomanNamespace.parse(blueprint);
+    if (parsed.unscoped.startsWith('generator-jhipster-')) {
+      return blueprint;
+    }
+    const namespace = new YeomanNamespace(parsed);
+    return namespace.with({ unscoped: `generator-jhipster-${namespace.unscoped}` }).toString();
+    // eslint-disable-next-line no-empty
+  } catch (e) {}
   if (blueprint && blueprint.startsWith('@')) {
     return blueprint;
   }

package/utils/field.js

@@ -187,15 +187,13 @@ const generateFakeDataForField = (field, faker, changelogDate, type = 'csv') =>
       data = undefined;
     }
   }
-  if (
-    data !== undefined &&
-    type === 'ts' &&
+  if (data !== undefined) {
     // eslint-disable-next-line no-template-curly-in-string
-    ![BOOLEAN, INTEGER, LONG, FLOAT, '${floatType}', DOUBLE, BIG_DECIMAL].includes(field.fieldType)
-  ) {
-    data = `'${data}'`;
-  } else if (data !== undefined && type === 'csv' && field.fieldValidate && field.fieldValidateRules.includes(PATTERN)) {
-    data = `"${data}"`;
+    if (type === 'ts' && ![BOOLEAN, INTEGER, LONG, FLOAT, '${floatType}', DOUBLE, BIG_DECIMAL].includes(field.fieldType)) {
+      data = `'${typeof data === 'string' ? data.replace(/'/g, "\\'") : data}'`;
+    } else if (type === 'csv' && field.fieldValidate && field.fieldValidateRules.includes(PATTERN)) {
+      data = `"${typeof data === 'string' ? data.replace(/"/g, '\\"') : data}"`;
+    }
   }
 
   return data;
@@ -328,7 +326,9 @@ function prepareFieldForTemplates(entityWithConfig, field, generator) {
   }
 
   field.fieldValidate = Array.isArray(field.fieldValidateRules) && field.fieldValidateRules.length >= 1;
-  field.nullable = !(field.fieldValidate === true && field.fieldValidateRules.includes(REQUIRED));
+  _.defaults(field, {
+    nullable: !(field.fieldValidate === true && field.fieldValidateRules.includes(REQUIRED)),
+  });
   field.unique = field.fieldValidate === true && field.fieldValidateRules.includes(UNIQUE);
   if (field.unique) {
     field.uniqueConstraintName = generator.getUXConstraintName(

package/generators/client/templates/react/src/main/webapp/app/config/translation-middleware.ts.ejs

@@ -1,58 +0,0 @@
-<%#
- 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.
-
- 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 { createListenerMiddleware } from '@reduxjs/toolkit';
-import { updateLocale, addTranslationSourcePrefix, loadLocale, loaded } from 'app/shared/reducers/locale';
-import getStore from './store';
-
-const listenerMiddleware = createListenerMiddleware();
-
-listenerMiddleware.startListening({
-  actionCreator: updateLocale,
-  async effect(action) {
-    const store = getStore();
-    const { sourcePrefixes, loadedKeys } = store.getState().locale;
-    const keys = (
-      await Promise.all(
-        [''].concat(sourcePrefixes).map(async sourcePrefix => {
-          const key = `${sourcePrefix}${action.payload}`;
-          if (loadedKeys.includes(key)) return;
-          await loadLocale(action.payload, sourcePrefix);
-          return key;
-        })
-      )
-    ).filter(Boolean);
-    store.dispatch(loaded(keys));
-  },
-});
-
-listenerMiddleware.startListening({
-  actionCreator: addTranslationSourcePrefix,
-  async effect(action) {
-    const store = getStore();
-    const { currentLocale, loadedKeys } = store.getState().locale;
-    const key = `${action.payload}${currentLocale}`;
-
-    if (!loadedKeys.includes(key)) {
-      await loadLocale(currentLocale, action.payload);
-    }
-    store.dispatch(loaded(key));
-  },
-});
-
-export default listenerMiddleware.middleware;

package/generators/server/templates/.npmrc.ejs

@@ -1 +0,0 @@
-script-shell=bash