generator-jhipster 7.2.0 → 7.3.0

package/cli/environment-builder.js

@@ -43,6 +43,7 @@ module.exports = class EnvironmentBuilder {
       jhipsterSharedData: new SharedData(),
     };
     const env = Environment.createEnv(args, { newErrorHandler: true, ...options, sharedOptions }, adapter);
+    env.setMaxListeners(0);
     return new EnvironmentBuilder(env);
   }
 

package/cli/import-jdl.js

@@ -432,8 +432,8 @@ class JDLProcessor {
         applicationWithEntities.config.applications = Object.fromEntries(
           relatedApplications.map(([baseName, config]) => {
             config.gatewayServerPort = gatewayServerPort;
-            const { serverPort, applicationIndex } = config;
-            return [baseName, { serverPort, applicationIndex }];
+            const { serverPort, applicationIndex, devServerPort } = config;
+            return [baseName, { serverPort, applicationIndex, devServerPort }];
           })
         );
       }

package/cli/jdl.js

@@ -54,6 +54,7 @@ module.exports = ([jdlFiles = []], options = {}, env, forkProcess) => {
   }
   const promises = jdlFiles.map(toJdlFile).map(filename => {
     if (!fs.existsSync(filename)) {
+      logger.info(`File not found: ${filename}. Attempting download from jdl-samples repository`);
       return download([[filename]], options);
     }
     return Promise.resolve(filename);

package/generators/bootstrap/index.js

@@ -160,10 +160,11 @@ module.exports = class extends BaseGenerator {
           }
         }
       });
+      const yoResolveTranform = this.options.skipYoResolve ? [] : [createYoResolveTransform(this.env.conflicter)];
       const transformStreams = [
         // multi-step changes the file path, should be executed earlier in the pipeline
         new MultiStepTransform(),
-        createYoResolveTransform(this.env.conflicter),
+        ...yoResolveTranform,
         createYoRcTransform(),
         createEachFileTransform(file => {
           if (path.extname(file.path) === '.json' && path.basename(path.dirname(file.path)) === '.jhipster') {

package/generators/client/__workflow/devserver-angular.json

@@ -3,7 +3,7 @@
     {
       "app-sample": "ngx-default",
       "cache": "angular",
-      "entity": "sqlfull",
+      "entity": "sqllight",
       "environment": "prod",
       "war": 0,
       "e2e": 1,

package/generators/client/__workflow/devserver-react.json

@@ -3,7 +3,7 @@
     {
       "app-sample": "react-default",
       "cache": "react",
-      "entity": "sqlfull",
+      "entity": "sqllight",
       "environment": "prod",
       "war": 0,
       "e2e": 1,

package/generators/client/__workflow/devserver-vue.json

@@ -3,7 +3,7 @@
     {
       "app-sample": "vue-default",
       "cache": "vue",
-      "entity": "sqlfull",
+      "entity": "sqllight",
       "environment": "prod",
       "war": 0,
       "e2e": 1,

package/generators/client/files-vue.js

@@ -68,6 +68,7 @@ const vueFiles = {
         'shims-vue.d.ts',
         'constants.ts',
         'main.ts',
+        'shared/alert/alert.service.ts',
         'shared/config/axios-interceptor.ts',
         'shared/config/config.ts',
         'shared/config/config-bootstrap-vue.ts',
@@ -231,6 +232,7 @@ const vueFiles = {
         'spec/app/core/error/error.component.spec.ts',
         'spec/app/core/jhi-navbar/jhi-navbar.component.spec.ts',
         'spec/app/core/ribbon/ribbon.component.spec.ts',
+        'spec/app/shared/alert/alert.service.spec.ts',
         'spec/app/shared/config/axios-interceptor.spec.ts',
         'spec/app/shared/data/data-utils.service.spec.ts',
       ],

package/generators/client/index.js

@@ -25,6 +25,8 @@ const writeAngularFiles = require('./files-angular').writeFiles;
 const writeReactFiles = require('./files-react').writeFiles;
 const { writeFiles: writeVueFiles, customizeFiles: customizeVueFiles } = require('./files-vue');
 const writeCommonFiles = require('./files-common').writeFiles;
+const { clientI18nFiles } = require('../languages/files');
+
 const packagejs = require('../../package.json');
 const constants = require('../generator-constants');
 const statistics = require('../statistics');
@@ -264,6 +266,19 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
           this.skipUserManagement = true;
         }
       },
+
+      async loadNativeLanguage() {
+        if (!this.jhipsterConfig.baseName) return;
+        const context = {};
+        this.loadAppConfig(undefined, context);
+        this.loadDerivedAppConfig(context);
+        this.loadClientConfig(undefined, context);
+        this.loadDerivedClientConfig(context);
+        this.loadServerConfig(undefined, context);
+        this.loadPlatformConfig(undefined, context);
+        this.loadTranslationConfig(undefined, context);
+        await this._loadClientTranslations(context);
+      },
     };
   }
 
@@ -399,4 +414,58 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator {
     if (useBlueprints) return;
     return this._end();
   }
+
+  /**
+   * @experimental
+   * Load client native translation.
+   */
+  async _loadClientTranslations(configContext = this) {
+    configContext.clientTranslations = this.configOptions.clientTranslations;
+    if (configContext.clientTranslations) {
+      this.clientTranslations = configContext.clientTranslations;
+      return;
+    }
+    const { nativeLanguage } = configContext;
+    this.clientTranslations = configContext.clientTranslations = this.configOptions.clientTranslations = {};
+    const rootTemplatesPath = this.fetchFromInstalledJHipster('languages/templates/');
+
+    // Prepare and load en translation
+    const translationFiles = await this.writeFiles({
+      sections: clientI18nFiles,
+      rootTemplatesPath,
+      context: {
+        ...configContext,
+        lang: 'en',
+        clientSrcDir: '__tmp__',
+      },
+    });
+
+    // Prepare and load native translation
+    configContext.lang = configContext.nativeLanguage;
+    if (nativeLanguage && nativeLanguage !== 'en') {
+      translationFiles.push(
+        ...(await this.writeFiles({
+          sections: clientI18nFiles,
+          rootTemplatesPath,
+          context: {
+            ...configContext,
+            lang: configContext.nativeLanguage,
+            clientSrcDir: '__tmp__',
+          },
+        }))
+      );
+    }
+    for (const translationFile of translationFiles) {
+      _.merge(this.clientTranslations, this.readDestinationJSON(translationFile));
+      delete this.env.sharedFs.get(translationFile).state;
+    }
+  }
+
+  /**
+   * @experimental
+   * Get translation value for a key.
+   */
+  _getClientTranslation(translationKey) {
+    return _.get(this.clientTranslations, translationKey, `Translation missing for ${translationKey}`);
+  }
 };

package/generators/client/templates/angular/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@angular/common": "12.2.5",
+    "@angular/common": "12.2.9",
     "bootstrap": "4.6.0",
     "@fortawesome/angular-fontawesome": "0.9.0",
     "@fortawesome/fontawesome-svg-core": "1.2.36",
@@ -12,18 +12,18 @@
     "ngx-infinite-scroll": "10.0.1",
     "ngx-webstorage": "8.0.0",
     "rxjs": "6.6.7",
-    "swagger-ui-dist": "3.52.2",
+    "swagger-ui-dist": "3.52.3",
     "tslib": "2.3.1",
     "zone.js": "0.11.4"
   },
   "devDependencies": {
-    "@angular/cli": "12.2.5",
-    "@angular-builders/custom-webpack": "12.1.2",
+    "@angular/cli": "12.2.9",
+    "@angular-builders/custom-webpack": "12.1.3",
     "@angular-builders/jest": "12.1.2",
-    "@angular-eslint/eslint-plugin": "12.4.1",
-    "@types/node": "16.9.1",
-    "@types/jest": "27.0.1",
-    "@typescript-eslint/eslint-plugin": "4.31.1",
+    "@angular-eslint/eslint-plugin": "12.5.0",
+    "@types/node": "16.10.3",
+    "@types/jest": "27.0.2",
+    "@typescript-eslint/eslint-plugin": "4.33.0",
     "browser-sync": "2.27.5",
     "browser-sync-webpack-plugin": "2.3.0",
     "copy-webpack-plugin": "9.0.1",
@@ -31,10 +31,10 @@
     "eslint-config-prettier": "8.3.0",
     "eslint-webpack-plugin": "3.0.1",
     "folder-hash": "4.0.1",
-    "jest": "27.2.0",
-    "jest-preset-angular": "9.0.7",
+    "jest": "27.2.4",
+    "jest-preset-angular": "10.0.1",
     "jest-date-mock": "1.0.8",
-    "jest-junit": "12.2.0",
+    "jest-junit": "13.0.0",
     "jest-sonar-reporter": "2.0.0",
     "merge-jsons-webpack-plugin": "1.0.21",
     "rimraf": "3.0.2",
@@ -43,6 +43,6 @@
     "webpack": "5.50.0",
     "webpack-bundle-analyzer": "4.4.2",
     "webpack-merge": "5.8.0",
-    "webpack-notifier": "1.13.0"
+    "webpack-notifier": "1.14.0"
   }
 }

package/generators/client/templates/angular/package.json.ejs

@@ -20,7 +20,7 @@
 {
   "name": "<%= dasherizedBaseName %>",
   "version": "0.0.1-SNAPSHOT",
-  "description": "Description for <%= baseName %>",
+  "description": "<%= projectDescription %>",
   "private": true,
   "license": "UNLICENSED",
   "cacheDirectories": [
@@ -175,6 +175,7 @@
     "test": "ng test --coverage --log-heap-usage -w=2",
     "test:watch": "<%= clientPackageManager %> run test -- --watch",
     "watch": "concurrently npm:start<% if(!skipServer) { %> npm:backend:start<% } %>",
+    "build-watch": "concurrently 'npm run webapp:build:dev -- --watch'<% if(!skipServer) { %> npm:backend:start<% } %>",
     "webapp:build": "<%= clientPackageManager %> run clean-www && <%= clientPackageManager %> run webapp:build:dev",
     "webapp:build:dev": "ng build --configuration development",
     "webapp:build:prod": "ng build --configuration production",

package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs

@@ -22,70 +22,68 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 import { ConfigurationService } from './configuration.service';
 import { Bean, ConfigProps, Env, PropertySource } from './configuration.model';
 
-describe('Service Tests', () => {
-  describe('Logs Service', () => {
-    let service: ConfigurationService;
-    let httpMock: HttpTestingController;
-    let expectedResult: Bean[] | PropertySource[] | null;
+describe('Logs Service', () => {
+  let service: ConfigurationService;
+  let httpMock: HttpTestingController;
+  let expectedResult: Bean[] | PropertySource[] | null;
 
-    beforeEach(() => {
-      TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule],
-      });
-
-      expectedResult = null;
-      service = TestBed.inject(ConfigurationService);
-      httpMock = TestBed.inject(HttpTestingController);
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
     });
 
-    afterEach(() => {
-      httpMock.verify();
-    });
+    expectedResult = null;
+    service = TestBed.inject(ConfigurationService);
+    httpMock = TestBed.inject(HttpTestingController);
+  });
 
-    describe('Service methods', () => {
-      it('should get the config', () => {
-        const bean: Bean = {
-          prefix: 'jhipster',
-          properties: {
-            clientApp: {
-              name: 'jhipsterApp',
-            },
+  afterEach(() => {
+    httpMock.verify();
+  });
+
+  describe('Service methods', () => {
+    it('should get the config', () => {
+      const bean: Bean = {
+        prefix: 'jhipster',
+        properties: {
+          clientApp: {
+            name: 'jhipsterApp',
           },
-        };
-        const configProps: ConfigProps = {
-          contexts: {
-            jhipster: {
-              beans: {
-                'tech.jhipster.config.JHipsterProperties': bean,
-              },
+        },
+      };
+      const configProps: ConfigProps = {
+        contexts: {
+          jhipster: {
+            beans: {
+              'tech.jhipster.config.JHipsterProperties': bean,
             },
           },
-        };
-        service.getBeans().subscribe(received => (expectedResult = received));
+        },
+      };
+      service.getBeans().subscribe(received => (expectedResult = received));
 
-        const req = httpMock.expectOne({ method: 'GET' });
-        req.flush(configProps);
-        expect(expectedResult).toEqual([bean]);
-      });
+      const req = httpMock.expectOne({ method: 'GET' });
+      req.flush(configProps);
+      expect(expectedResult).toEqual([bean]);
+    });
 
-      it('should get the env', () => {
-        const propertySources: PropertySource[] = [
-          {
-            name: 'server.ports',
-            properties: {
-              'local.server.port': {
-                value: '8080',
-              },
+    it('should get the env', () => {
+      const propertySources: PropertySource[] = [
+        {
+          name: 'server.ports',
+          properties: {
+            'local.server.port': {
+              value: '8080',
             },
           },
-        ];
-        const env: Env = { propertySources };
-        service.getPropertySources().subscribe(received => (expectedResult = received));
+        },
+      ];
+      const env: Env = { propertySources };
+      service.getPropertySources().subscribe(received => (expectedResult = received));
 
-        const req = httpMock.expectOne({ method: 'GET' });
-        req.flush(env);
-        expect(expectedResult).toEqual(propertySources);
-      });
+      const req = httpMock.expectOne({ method: 'GET' });
+      req.flush(env);
+      expect(expectedResult).toEqual(propertySources);
     });
   });
 });

package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs

@@ -21,31 +21,29 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 
 import { LogsService } from './logs.service';
 
-describe('Service Tests', () => {
-  describe('Logs Service', () => {
-    let service: LogsService;
-    let httpMock: HttpTestingController;
-
-    beforeEach(() => {
-      TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule],
-      });
-
-      service = TestBed.inject(LogsService);
-      httpMock = TestBed.inject(HttpTestingController);
-    });
+describe('Logs Service', () => {
+  let service: LogsService;
+  let httpMock: HttpTestingController;
 
-    afterEach(() => {
-      httpMock.verify();
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
     });
 
-    describe('Service methods', () => {
-      it('should change log level', () => {
-        service.changeLevel('main', 'ERROR').subscribe();
+    service = TestBed.inject(LogsService);
+    httpMock = TestBed.inject(HttpTestingController);
+  });
+
+  afterEach(() => {
+    httpMock.verify();
+  });
+
+  describe('Service methods', () => {
+    it('should change log level', () => {
+      service.changeLevel('main', 'ERROR').subscribe();
 
-        const req = httpMock.expectOne({ method: 'POST' });
-        expect(req.request.body).toEqual({ configuredLevel: 'ERROR' });
-      });
+      const req = httpMock.expectOne({ method: 'POST' });
+      expect(req.request.body).toEqual({ configuredLevel: 'ERROR' });
     });
   });
 });

package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs

@@ -22,80 +22,78 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 import { MetricsService } from './metrics.service';
 import { ThreadDump, ThreadState } from './metrics.model';
 
-describe('Service Tests', () => {
-  describe('Logs Service', () => {
-    let service: MetricsService;
-    let httpMock: HttpTestingController;
+describe('Logs Service', () => {
+  let service: MetricsService;
+  let httpMock: HttpTestingController;
 
-    beforeEach(() => {
-      TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule],
-      });
-      service = TestBed.inject(MetricsService);
-      httpMock = TestBed.inject(HttpTestingController);
-    });
-
-    afterEach(() => {
-      httpMock.verify();
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
     });
+    service = TestBed.inject(MetricsService);
+    httpMock = TestBed.inject(HttpTestingController);
+  });
 
-    describe('Service methods', () => {
-      it('should return Metrics', () => {
-        let expectedResult;
-        const metrics = {
-          jvm: {},
-          'http.server.requests': {},
-          cache: {},
-          services: {},
-          databases: {},
-          garbageCollector: {},
-          processMetrics: {},
-        };
+  afterEach(() => {
+    httpMock.verify();
+  });
 
-        service.getMetrics().subscribe(received => {
-          expectedResult = received;
-        });
+  describe('Service methods', () => {
+    it('should return Metrics', () => {
+      let expectedResult;
+      const metrics = {
+        jvm: {},
+        'http.server.requests': {},
+        cache: {},
+        services: {},
+        databases: {},
+        garbageCollector: {},
+        processMetrics: {},
+      };
 
-        const req = httpMock.expectOne({ method: 'GET' });
-        req.flush(metrics);
-        expect(expectedResult).toEqual(metrics);
+      service.getMetrics().subscribe(received => {
+        expectedResult = received;
       });
 
-      it('should return Thread Dump', () => {
-        let expectedResult: ThreadDump | null = null;
-        const dump: ThreadDump = {
-          threads: [
-            {
-              threadName: 'Reference Handler',
-              threadId: 2,
-              blockedTime: -1,
-              blockedCount: 7,
-              waitedTime: -1,
-              waitedCount: 0,
-              lockName: null,
-              lockOwnerId: -1,
-              lockOwnerName: null,
-              daemon: true,
-              inNative: false,
-              suspended: false,
-              threadState: ThreadState.Runnable,
-              priority: 10,
-              stackTrace: [],
-              lockedMonitors: [],
-              lockedSynchronizers: [],
-              lockInfo: null,
-            },
-          ],
-        };
+      const req = httpMock.expectOne({ method: 'GET' });
+      req.flush(metrics);
+      expect(expectedResult).toEqual(metrics);
+    });
 
-        service.threadDump().subscribe(received => {
-          expectedResult = received;
-        });
+    it('should return Thread Dump', () => {
+      let expectedResult: ThreadDump | null = null;
+      const dump: ThreadDump = {
+        threads: [
+          {
+            threadName: 'Reference Handler',
+            threadId: 2,
+            blockedTime: -1,
+            blockedCount: 7,
+            waitedTime: -1,
+            waitedCount: 0,
+            lockName: null,
+            lockOwnerId: -1,
+            lockOwnerName: null,
+            daemon: true,
+            inNative: false,
+            suspended: false,
+            threadState: ThreadState.Runnable,
+            priority: 10,
+            stackTrace: [],
+            lockedMonitors: [],
+            lockedSynchronizers: [],
+            lockInfo: null,
+          },
+        ],
+      };
 
-        const req = httpMock.expectOne({ method: 'GET' });
-        req.flush(dump);
-        expect(expectedResult).toEqual(dump);
+      service.threadDump().subscribe(received => {
+        expectedResult = received;
       });
+
+      const req = httpMock.expectOne({ method: 'GET' });
+      req.flush(dump);
+      expect(expectedResult).toEqual(dump);
     });
   });
 });