Merge branch 'jhipster-upstream'

.editorconfig

@@ -11,6 +11,3 @@ insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
-
-[{*.{java,java.ejs,xml.ejs,gradle.ejs,sh,sh.ejs,n1ql.ejs,cql.ejs,scala.ejs},USAGE}]
-indent_size = 4

generators/client/generator.mjs

@@ -0,0 +1,113 @@
+import chalk from 'chalk';
+import ClientGenerator from 'generator-jhipster/generators/client';
+import { writeFiles as writeAngularFiles } from './files-angular.js';
+import _ from 'lodash';
+import path from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default class extends ClientGenerator {
+  constructor(args, opts, features) {
+    super(args, opts, features);
+
+    if (this.options.help) return;
+
+    if (!this.options.jhipsterContext) {
+      throw new Error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints test-blueprint')}`);
+    }
+  }
+
+  get [ClientGenerator.INITIALIZING]() {
+    return {
+      ...super.initializing,
+      async initializingTemplateTask() {},
+    };
+  }
+
+  get [ClientGenerator.PROMPTING]() {
+    return {
+      ...super.prompting,
+      async promptingTemplateTask() {},
+    };
+  }
+
+  get [ClientGenerator.CONFIGURING]() {
+    return {
+      ...super.configuring,
+      async configuringTemplateTask() {},
+    };
+  }
+
+  get [ClientGenerator.COMPOSING]() {
+    return {
+      ...super.composing,
+      async composingTemplateTask() {},
+    };
+  }
+
+  get [ClientGenerator.LOADING]() {
+    return {
+      ...super.loading,
+      // copied from jhipster and replaced "this.fetchFromInstalledJHipster('client', " by path.join('__dirname', with __dirname defined as above since in module
+      loadPackageJson() {
+        // Load common client package.json into packageJson
+        _.merge(
+          this.dependabotPackageJson,
+          this.fs.readJSON(path.join(__dirname, 'templates', 'common', 'package.json'))
+        );
+        // Load client package.json into packageJson
+        const clientFramewok = this.application.clientFramework;
+        _.merge(
+          this.dependabotPackageJson,
+          this.fs.readJSON(path.join(__dirname, 'templates', clientFramewok, 'package.json'))
+        );
+      },
+    };
+    // const loadingFromJhipster = { ...super.loading };
+    // return Object.fromEntries(Object.entries(loadingFromJhipster).map(([k, v]) => k === 'loadPackageJson' ? v.bind(this) : v));
+    // return loadingFromJhipster;
+  }
+
+  get [ClientGenerator.PREPARING]() {
+    return {
+      ...super.preparing,
+      async preparingTemplateTask() {},
+    };
+  }
+
+  get [ClientGenerator.DEFAULT]() {
+    return {
+      ...super.default,
+      async defaultTemplateTask() {},
+    };
+  }
+
+  get [ClientGenerator.WRITING]() {
+    return {
+      ...super.writing,
+      writeAngularFiles
+    };
+  }
+
+  get [ClientGenerator.POST_WRITING]() {
+    return {
+      ...super.postWriting,
+      async postWritingTemplateTask() {},
+    };
+  }
+
+  get [ClientGenerator.INSTALL]() {
+    return {
+      ...super.install,
+      async installTemplateTask() {},
+    };
+  }
+
+  get [ClientGenerator.END]() {
+    return {
+      ...super.end,
+      async endTemplateTask() {},
+    };
+  }
+}

generators/client/generator.spec.mjs

@@ -0,0 +1,28 @@
+import { expect } from 'expect';
+
+import { helpers, lookups } from '#test-utils';
+
+const SUB_GENERATOR = 'client';
+const BLUEPRINT_NAMESPACE = `jhipster:${SUB_GENERATOR}`;
+
+describe('SubGenerator client of test-blueprint JHipster blueprint', () => {
+  describe('run', () => {
+    let result;
+    before(async function () {
+      result = await helpers
+        .create(BLUEPRINT_NAMESPACE)
+        .withOptions({
+          reproducible: true,
+          defaults: true,
+          baseName: 'jhipster',
+          blueprint: 'test-blueprint',
+        })
+        .withLookups(lookups)
+        .run();
+    });
+
+    it('should succeed', () => {
+      expect(result.getStateSnapshot()).toMatchSnapshot();
+    });
+  });
+});

generators/client/index.mjs

@@ -0,0 +1 @@
+export { default } from './generator.mjs';

generators/client/needle-api/needle-client-angular.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.
@@ -18,8 +18,8 @@
  */
 const chalk = require('chalk');
 const _ = require('lodash');
-const constants = require('generator-jhipster/generators/generator-constants');
-const jhipsterUtils = require('generator-jhipster/generators/utils');
+const constants = require('generator-jhipster/generators/generator-constants.js');
+const jhipsterUtils = require('generator-jhipster/generators/utils.js');
 const needleClientBase = require('./needle-client');
 
 module.exports = class extends needleClientBase {

generators/client/needle-api/needle-client-i18n.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.
@@ -20,24 +20,24 @@ const chalk = require('chalk');
 const needleClient = require('./needle-client');
 
 module.exports = class extends needleClient {
-  addElementTranslationKey(key, value, language) {
+  addElementTranslationKey(key, value, language, webappSrcDir) {
     const errorMessage = ' not added as a new entity in the menu.';
-    this._addTranslationKey(key, value, language, errorMessage, 'jhipster-needle-menu-add-element');
+    this._addTranslationKey(key, value, language, errorMessage, 'jhipster-needle-menu-add-element', webappSrcDir);
   }
 
-  addAdminElementTranslationKey(key, value, language) {
+  addAdminElementTranslationKey(key, value, language, webappSrcDir) {
     const errorMessage = ' not added as a new entry in the admin menu.';
-    this._addTranslationKey(key, value, language, errorMessage, 'jhipster-needle-menu-add-admin-element');
+    this._addTranslationKey(key, value, language, errorMessage, 'jhipster-needle-menu-add-admin-element', webappSrcDir);
   }
 
-  addEntityTranslationKey(key, value, language) {
+  addEntityTranslationKey(key, value, language, webappSrcDir) {
     const errorMessage = ' not added as a new entity in the menu.';
-    this._addTranslationKey(key, value, language, errorMessage, 'jhipster-needle-menu-add-entry');
+    this._addTranslationKey(key, value, language, errorMessage, 'jhipster-needle-menu-add-entry', webappSrcDir);
   }
 
-  _addTranslationKey(key, value, language, errorMessage, needle) {
+  _addTranslationKey(key, value, language, errorMessage, needle, webappSrcDir = this.CLIENT_MAIN_SRC_DIR) {
     const fullErrorMessage = `${chalk.yellow(' Reference to ') + language} ${chalk.yellow(errorMessage)}`;
-    const fullPath = `${this.CLIENT_MAIN_SRC_DIR}i18n/${language}/global.json`;
+    const fullPath = `${webappSrcDir}i18n/${language}/global.json`;
     const rewriteFileModel = this.generateFileModel(fullPath, needle, `"${key}": "${value}",`);
 
     this.addBlockContentToFile(rewriteFileModel, fullErrorMessage);