generator-jhipster 8.7.1 → 8.7.2

package/dist/generators/vue/generator.js

@@ -72,6 +72,9 @@ export default class VueGenerator extends BaseApplicationGenerator {
             prepareForTemplates({ application, source }) {
                 application.addPrettierExtensions?.(['html', 'vue', 'css', 'scss']);
                 source.addWebpackConfig = args => {
+                    if (!application.clientBundlerWebpack) {
+                        throw new Error('This application is not webpack based');
+                    }
                     const webpackPath = `${application.clientRootDir}webpack/webpack.common.js`;
                     const ignoreNonExisting = this.sharedData.getControl().ignoreNeedlesError && 'Webpack configuration file not found';
                     this.editFile(webpackPath, { ignoreNonExisting }, createNeedleCallback({
@@ -112,8 +115,8 @@ export default class VueGenerator extends BaseApplicationGenerator {
     }
     get writing() {
         return this.asWritingTaskGroup({
-            cleanup({ control }) {
-                control.cleanupFiles({
+            async cleanup({ control }) {
+                await control.cleanupFiles({
                     '8.6.1': ['.eslintrc.json', '.eslintignore'],
                 });
             },
@@ -137,8 +140,86 @@ export default class VueGenerator extends BaseApplicationGenerator {
     }
     get postWriting() {
         return this.asPostWritingTaskGroup({
+            addPackageJsonScripts({ application }) {
+                const { clientBundlerVite, clientBundlerWebpack, clientPackageManager, prettierExtensions } = application;
+                if (clientBundlerVite) {
+                    this.packageJson.merge({
+                        scripts: {
+                            'webapp:build:dev': `${clientPackageManager} run vite-build`,
+                            'webapp:build:prod': `${clientPackageManager} run vite-build`,
+                            'webapp:dev': `${clientPackageManager} run vite-serve`,
+                            'webapp:serve': `${clientPackageManager} run vite-serve`,
+                            'vite-serve': 'vite',
+                            'vite-build': 'vite build',
+                        },
+                    });
+                }
+                else if (clientBundlerWebpack) {
+                    this.packageJson.merge({
+                        scripts: {
+                            'prettier:check': `prettier --check "{,src/**/,webpack/,.blueprint/**/}*.{${prettierExtensions}}"`,
+                            'prettier:format': `prettier --write "{,src/**/,webpack/,.blueprint/**/}*.{${prettierExtensions}}"`,
+                            'webapp:build:dev': `${clientPackageManager} run webpack -- --mode development --env stats=minimal`,
+                            'webapp:build:prod': `${clientPackageManager} run webpack -- --mode production --env stats=minimal`,
+                            'webapp:dev': `${clientPackageManager} run webpack-dev-server -- --mode development --env stats=normal`,
+                            'webpack-dev-server': 'webpack serve --config webpack/webpack.common.js',
+                            webpack: 'webpack --config webpack/webpack.common.js',
+                        },
+                    });
+                }
+            },
+            addMicrofrontendDependencies({ application }) {
+                const { applicationTypeGateway, clientBundlerVite, clientBundlerWebpack, enableTranslation, microfrontend } = application;
+                if (!microfrontend)
+                    return;
+                if (clientBundlerVite) {
+                    this.packageJson.merge({
+                        devDependencies: {
+                            '@originjs/vite-plugin-federation': '1.3.6',
+                        },
+                    });
+                }
+                else if (clientBundlerWebpack) {
+                    if (applicationTypeGateway) {
+                        this.packageJson.merge({
+                            devDependencies: {
+                                '@module-federation/utilities': null,
+                            },
+                        });
+                    }
+                    this.packageJson.merge({
+                        devDependencies: {
+                            '@module-federation/enhanced': null,
+                            'browser-sync-webpack-plugin': null,
+                            'copy-webpack-plugin': null,
+                            'css-loader': null,
+                            'css-minimizer-webpack-plugin': null,
+                            'html-webpack-plugin': null,
+                            'mini-css-extract-plugin': null,
+                            'postcss-loader': null,
+                            'sass-loader': null,
+                            'terser-webpack-plugin': null,
+                            'ts-loader': null,
+                            'vue-loader': null,
+                            'vue-style-loader': null,
+                            webpack: null,
+                            'webpack-bundle-analyzer': null,
+                            'webpack-cli': null,
+                            'webpack-dev-server': null,
+                            'webpack-merge': null,
+                            'workbox-webpack-plugin': null,
+                            ...(enableTranslation
+                                ? {
+                                    'folder-hash': null,
+                                    'merge-jsons-webpack-plugin': null,
+                                }
+                                : {}),
+                        },
+                    });
+                }
+            },
             addIndexAsset({ source, application }) {
-                if (application.microfrontend)
+                if (!application.clientBundlerVite)
                     return;
                 source.addExternalResourceToRoot({
                     resource: '<script>const global = globalThis;</script>',

package/dist/generators/vue/resources/package.json

@@ -13,17 +13,18 @@
     "bootswatch": "4.6.2",
     "deepmerge": "4.3.1",
     "js-cookie": "3.0.5",
-    "pinia": "2.2.2",
+    "pinia": "2.2.4",
     "rxjs": "7.8.1",
     "sockjs-client": "1.6.1",
-    "vue": "3.5.6",
-    "vue-i18n": "10.0.1",
+    "vue": "3.5.12",
+    "vue-i18n": "10.0.4",
     "vue-router": "4.4.5"
   },
   "devDependencies": {
-    "@eslint/js": "9.10.0",
-    "@module-federation/utilities": "3.1.12",
-    "@pinia/testing": "0.1.5",
+    "@eslint/js": "9.13.0",
+    "@module-federation/enhanced": "0.6.13",
+    "@module-federation/utilities": "3.1.19",
+    "@pinia/testing": "0.1.6",
     "@tsconfig/node18": "18.2.4",
     "@types/node": "20.11.25",
     "@types/sinon": "17.0.3",
@@ -31,18 +32,18 @@
     "@vue/test-utils": "2.4.6",
     "@vue/tsconfig": "0.5.1",
     "autoprefixer": "10.4.20",
-    "axios-mock-adapter": "2.0.0",
+    "axios-mock-adapter": "2.1.0",
     "browser-sync-webpack-plugin": "2.3.0",
     "copy-webpack-plugin": "12.0.2",
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
-    "eslint": "9.10.0",
+    "eslint": "9.13.0",
     "eslint-plugin-prettier": "5.2.1",
-    "eslint-plugin-vue": "9.28.0",
+    "eslint-plugin-vue": "9.29.1",
     "flush-promises": "1.0.2",
     "folder-hash": "4.0.4",
     "happy-dom": "14.12.3",
-    "html-webpack-plugin": "5.6.0",
+    "html-webpack-plugin": "5.6.3",
     "merge-jsons-webpack-plugin": "2.0.1",
     "mini-css-extract-plugin": "2.9.1",
     "numeral": "2.0.6",
@@ -50,21 +51,21 @@
     "postcss-loader": "8.1.1",
     "postcss-url": "10.1.3",
     "rimraf": "5.0.8",
-    "sass": "1.79.2",
-    "sass-loader": "16.0.1",
+    "sass": "1.64.2",
+    "sass-loader": "16.0.2",
     "sinon": "19.0.2",
     "terser-webpack-plugin": "5.3.10",
     "ts-loader": "9.5.1",
-    "typescript": "5.6.2",
-    "typescript-eslint": "8.6.0",
-    "vite": "5.4.6",
-    "vite-plugin-static-copy": "1.0.6",
-    "vitest": "2.1.1",
+    "typescript": "5.6.3",
+    "typescript-eslint": "8.11.0",
+    "vite": "5.4.10",
+    "vite-plugin-static-copy": "2.0.0",
+    "vitest": "2.1.3",
     "vitest-sonar-reporter": "2.0.0",
     "vue-loader": "17.4.2",
     "vue-style-loader": "4.1.3",
-    "vue-tsc": "2.1.6",
-    "webpack": "5.94.0",
+    "vue-tsc": "2.1.8",
+    "webpack": "5.95.0",
     "webpack-bundle-analyzer": "4.10.2",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "5.1.0",

package/dist/generators/vue/support/update-languages.js

@@ -54,7 +54,7 @@ function updateLanguagesInWebpackTask({ application, control = {} }) {
 export default function updateLanguagesTask(taskParam) {
     updateLanguagesInPipeTask.call(this, taskParam);
     updateLanguagesInConfigTask.call(this, taskParam);
-    if (taskParam.application.microfrontend) {
+    if (taskParam.application.clientBundlerWebpack) {
         updateLanguagesInWebpackTask.call(this, taskParam);
     }
     updateLanguagesInDayjsConfigurationTask.call(this, taskParam, {

package/dist/generators/vue/templates/module-federation.config.cjs.ejs

@@ -0,0 +1,55 @@
+<%#
+ Copyright 2013-2024 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.
+-%>
+const packageJson = require('./package.json');
+
+// Microfrontend api, should match across gateway and microservices.
+const apiVersion = '0.0.1';
+
+const sharedDefaults = { singleton: true, strictVersion: true, requiredVersion: apiVersion };
+const shareMappings = (...mappings) => Object.fromEntries(mappings.map(map => [map, { ...sharedDefaults, version: apiVersion }]));
+
+const shareDependencies = ({ skipList = [] } = {}) =>
+  Object.fromEntries(
+    Object.entries(packageJson.dependencies)
+      .filter(([dependency]) => !skipList.includes(dependency))
+      .map(([dependency, version]) => [dependency, { ...sharedDefaults, version, requiredVersion: version }]),
+  );
+
+/** @type {import('@module-federation/runtime').Options} */
+module.exports = {
+  name: '<%= lowercaseBaseName %>',
+<%_ if (applicationTypeMicroservice) { _%>
+  exposes: {
+    './entities-router': './<%- this.relativeDir(clientRootDir, clientSrcDir) %>app/router/entities.ts',
+    './entities-menu': './<%- this.relativeDir(clientRootDir, clientSrcDir) %>app/entities/entities-menu.vue',
+  },
+<%_ } _%>
+  filename: 'remoteEntry.js',
+  shareScope: 'default',
+  shared: {
+    ...shareDependencies(),
+    ...shareMappings(
+      '@/shared/security/authority',
+      '@/shared/alert/alert.service',
+      '@/locale/translation.service',
+    ),
+  },
+  dts: false,
+  manifest: false,
+};

package/dist/generators/vue/templates/package.json.ejs

@@ -55,34 +55,6 @@
     "vue-router": "<%= nodeDependencies['vue-router'] %>"
   },
   "devDependencies": {
-<%_ if (applicationTypeGateway && microfrontend) { _%>
-    "@module-federation/utilities": "<%= nodeDependencies['@module-federation/utilities'] %>",
-<%_ } _%>
-<%_ if (microfrontend) { _%>
-    "@originjs/vite-plugin-federation": "1.3.3",
-    "browser-sync-webpack-plugin": "<%= nodeDependencies['browser-sync-webpack-plugin'] %>",
-    "copy-webpack-plugin": "<%= nodeDependencies['copy-webpack-plugin'] %>",
-    "css-loader": "<%= nodeDependencies['css-loader'] %>",
-    "css-minimizer-webpack-plugin": "<%= nodeDependencies['css-minimizer-webpack-plugin'] %>",
-    "html-webpack-plugin": "<%= nodeDependencies['html-webpack-plugin'] %>",
-  <%_ if (enableTranslation) { _%>
-    "folder-hash": "<%= nodeDependencies['folder-hash'] %>",
-    "merge-jsons-webpack-plugin": "<%= nodeDependencies['merge-jsons-webpack-plugin'] %>",
-  <%_ } _%>
-    "mini-css-extract-plugin": "<%= nodeDependencies['mini-css-extract-plugin'] %>",
-    "postcss-loader": "<%= nodeDependencies['postcss-loader'] %>",
-    "sass-loader": "<%= nodeDependencies['sass-loader'] %>",
-    "terser-webpack-plugin": "<%= nodeDependencies['terser-webpack-plugin'] %>",
-    "ts-loader": "<%= nodeDependencies['ts-loader'] %>",
-    "vue-loader": "<%= nodeDependencies['vue-loader'] %>",
-    "vue-style-loader": "<%= nodeDependencies['vue-style-loader'] %>",
-    "webpack": "<%= nodeDependencies['webpack'] %>",
-    "webpack-bundle-analyzer": "<%= nodeDependencies['webpack-bundle-analyzer'] %>",
-    "webpack-cli": "<%= nodeDependencies['webpack-cli'] %>",
-    "webpack-dev-server": "<%= nodeDependencies['webpack-dev-server'] %>",
-    "webpack-merge": "<%= nodeDependencies['webpack-merge'] %>",
-    "workbox-webpack-plugin": "<%= nodeDependencies['workbox-webpack-plugin'] %>",
-<%_ } _%>
     "@eslint/js": null,
     "@pinia/testing": "<%= nodeDependencies['@pinia/testing'] %>",
     "@types/node": "<%= nodeDependencies['@types/node'] %>",
@@ -118,55 +90,32 @@
     "vitest-sonar-reporter": "<%= nodeDependencies['vitest-sonar-reporter'] %>"
   },
   "engines": {
-    "node": ">=<%= nodeVersion %>",
-    "npm": ">= 6.14.4"
+    "node": ">=<%= nodeVersion %>"
   },
   "config": {
     "default_environment": "prod"
   },
   "scripts": {
-<%_ if (microfrontend) { %>
-    "prettier:check": "prettier --check \"{,src/**/,webpack/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
-    "prettier:format": "prettier --write \"{,src/**/,webpack/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
-<%_ } else { %>
-    "prettier:check": "prettier --check \"{,src/**/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
-    "prettier:format": "prettier --write \"{,src/**/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
-<%_ } %>
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
+    "build": "<%= clientPackageManager %> run webapp:prod --",
+    "build-watch": "concurrently 'npm run webapp:build:dev -- --watch'<% if(!skipServer) { %> npm:backend:start<% } %>",
     "cleanup": "rimraf <%= this.relativeDir(clientRootDir, temporaryDir) %>",
     "clean-www": "rimraf <%= this.relativeDir(clientRootDir, clientDistDir) %>",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "prettier:check": "prettier --check \"{,src/**/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
+    "prettier:format": "prettier --write \"{,src/**/,.blueprint/**/}*.{<%= prettierExtensions %>}\"",
+    "serve": "<%= clientPackageManager %> run start --",
     "start": "<%= clientPackageManager %> run webapp:dev --",
     "start-tls": "<%= clientPackageManager %> run webapp:dev -- --env.tls",
-    "serve": "<%= clientPackageManager %> run start --",
-    "build": "<%= clientPackageManager %> run webapp:prod --",
-    "build-watch": "concurrently 'npm run webapp:build:dev -- --watch'<% if(!skipServer) { %> npm:backend:start<% } %>",
-    "vitest-run": "vitest --run --coverage",
-    "vitest": "vitest",
     "pretest": "<%= clientPackageManager %> run lint",
     "test": "<%= clientPackageManager %> run vitest-run --",
     "test:watch": "<%= clientPackageManager %> run vitest",
+    "vitest-run": "vitest --run --coverage",
+    "vitest": "vitest",
     "watch": "concurrently npm:start<% if(!skipServer) { %> npm:backend:start<% } %>",
     "webapp:build": "<%= clientPackageManager %> run clean-www && <%= clientPackageManager %> run webapp:build:dev --",
-<%_ if (microfrontend) { %>
-    "webapp:build:dev": "<%= clientPackageManager %> run webpack -- --mode development --env stats=minimal",
-    "webapp:build:prod": "<%= clientPackageManager %> run webpack -- --mode production --env stats=minimal",
-    "webapp:dev": "<%= clientPackageManager %> run webpack-dev-server -- --mode development --env stats=normal",
-<%_ } else { %>
-    "webapp:build:dev": "<%= clientPackageManager %> run vite-build",
-    "webapp:build:prod": "<%= clientPackageManager %> run vite-build",
-    "webapp:dev": "<%= clientPackageManager %> run vite-serve",
-    "webapp:serve": "<%= clientPackageManager %> run vite-serve",
-<%_ } %>
     "webapp:prod": "<%= clientPackageManager %> run clean-www && <%= clientPackageManager %> run webapp:build:prod --",
-    "webapp:test": "<%= clientPackageManager %> run test --",
-<%_ if (microfrontend) { %>
-    "webpack-dev-server": "webpack serve --config webpack/webpack.common.js",
-    "webpack": "webpack --config webpack/webpack.common.js"
-<%_ } else { %>
-    "vite-serve": "vite",
-    "vite-build": "vite build"
-<%_ } %>
+    "webapp:test": "<%= clientPackageManager %> run test --"
   },
   "browserslist": [
     "> 1%",

package/dist/generators/vue/templates/src/main/webapp/app/main.ts.ejs

@@ -186,7 +186,7 @@ const app = createApp({
 
     provide('trackerService', useTrackerService({ authenticated }));
 <%_ } _%>
-<%_ if (applicationTypeMicroservice && microfrontend) { _%>
+<%_ if (enableTranslation && applicationTypeMicroservice && microfrontend) { _%>
     provide('microfrontendI18n', false);
 <%_ } _%>
   },

package/dist/generators/vue/templates/vite.config.mts.ejs

@@ -17,18 +17,17 @@
  limitations under the License.
 -%>
 import { fileURLToPath, URL } from 'node:url';
-import { existsSync } from 'node:fs';
 import { normalizePath } from 'vite'
 
 import {
-<%_ if (microfrontend) { _%>
+<%_ if (microfrontend && clientBundlerVite) { _%>
   mergeConfig,
 <%_ } _%>
   defineConfig,
 } from 'vite';
 import vue from '@vitejs/plugin-vue';
 import { viteStaticCopy } from 'vite-plugin-static-copy';
-<%_ if (microfrontend) { _%>
+<%_ if (microfrontend && clientBundlerVite) { _%>
 import federation from "@originjs/vite-plugin-federation";
 
   <%_ if (applicationTypeGateway) { _%>
@@ -36,11 +35,6 @@ const sharedAppVersion = '0.0.0';
   <%_ } _%>
 <%_ } _%>
 
-const getFileFromRepo = (file: string) =>
-  existsSync(fileURLToPath(new URL(`../node_modules/${file}`, import.meta.url)))
-    ? fileURLToPath(new URL(`../node_modules/${file}`, import.meta.url))
-    : fileURLToPath(new URL(`./node_modules/${file}`, import.meta.url));
-
 const { getAbsoluteFSPath } = await import('swagger-ui-dist');
 const swaggerUiPath = getAbsoluteFSPath();
 
@@ -54,7 +48,7 @@ let config = defineConfig({
           src: [
             `${normalizePath(swaggerUiPath)}/*.{js,css,html,png}`,
             `!${normalizePath(swaggerUiPath)}/**/index.html`,
-            normalizePath(getFileFromRepo('axios/dist/axios.min.js')),
+            normalizePath(fileURLToPath(new URL('./dist/axios.min.js', import.meta.resolve('axios/package.json')))),
             normalizePath(fileURLToPath(new URL('./<%- this.relativeDir(clientRootDir, clientSrcDir) %>swagger-ui/index.html', import.meta.url))),
           ],
           dest: 'swagger-ui',
@@ -122,7 +116,7 @@ let config = defineConfig({
   },
 });
 
-<%_ if (microfrontend) { _%>
+<%_ if (microfrontend && clientBundlerVite) { _%>
 config = mergeConfig(config, {
   build: {
     modulePreload: false,
@@ -132,19 +126,19 @@ config = mergeConfig(config, {
   plugins: [
     federation({
       name: '<%= lowercaseBaseName %>',
-<%_ if (applicationTypeGateway) { _%>
+  <%_ if (applicationTypeGateway) { _%>
       remotes: {
-  <%_ for (const remote of microfrontends) { _%>
+    <%_ for (const remote of microfrontends) { _%>
         '@<%= remote.lowercaseBaseName %>': `/<%= remote.endpointPrefix %>/assets/remoteEntry.js`,
   <%_ } _%>
       },
-<%_ } _%>
-<%_ if (applicationTypeMicroservice) { _%>
+  <%_ } _%>
+  <%_ if (applicationTypeMicroservice) { _%>
       exposes: {
         './entities-router': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/router/entities',
         './entities-menu': './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/entities/entities-menu.vue',
       },
-<%_ } _%>
+  <%_ } _%>
       shared: {
         '@vuelidate/core': {},
         '@vuelidate/validators': {},
@@ -158,21 +152,21 @@ config = mergeConfig(config, {
         pinia: {},
         '@/shared/security/authority': {
           packagePath: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/shared/security/authority',
-<%_ if (applicationTypeGateway) { _%>
+  <%_ if (applicationTypeGateway) { _%>
           version: sharedAppVersion,
-<%_ } _%>
+  <%_ } _%>
         },
         '@/shared/alert/alert.service': {
           packagePath: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/shared/alert/alert.service',
-<%_ if (applicationTypeGateway) { _%>
+  <%_ if (applicationTypeGateway) { _%>
           version: sharedAppVersion,
-<%_ } _%>
+  <%_ } _%>
         },
         '@/locale/translation.service': {
           packagePath: './<%= this.relativeDir(clientRootDir, clientSrcDir) %>app/locale/translation.service',
-<%_ if (applicationTypeGateway) { _%>
+  <%_ if (applicationTypeGateway) { _%>
           version: sharedAppVersion,
-<%_ } _%>
+  <%_ } _%>
         },
       },
     }),

package/dist/generators/workspaces/generator.d.ts

@@ -18,20 +18,31 @@
  */
 import BaseWorkspacesGenerator from '../base-workspaces/index.js';
 export default class WorkspacesGenerator extends BaseWorkspacesGenerator {
-    workspaces: any;
-    generateApplications: any;
-    generateWith: any;
-    entrypointGenerator: any;
-    generateWorkspaces: any;
+    workspaces: boolean;
+    generateApplications: () => Promise<undefined>;
+    generateWith: string;
+    entrypointGenerator: string;
+    dockerCompose: boolean;
+    generateWorkspaces: boolean;
     workspacesConfig: Record<string, any>;
     beforeQueue(): Promise<void>;
     get initializing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "loadConfig">;
     get configuring(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "configure" | "configureUsingFiles">;
     get composing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "generateApplications" | "composeGit">;
-    get loading(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "checkWorkspaces">;
-    get loadingWorkspaces(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "loadConfig" | "configurePackageManager">;
-    get writing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "writing">;
-    get postWriting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithSource<any>, "generatePackageJson">;
+    get loading(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl & {
+        applications: import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>[];
+    }, "checkWorkspaces">;
+    get loadingWorkspaces(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl & {
+        applications: import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>[];
+    }, "loadConfig" | "configurePackageManager">;
+    get writing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl & {
+        applications: import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>[];
+    }, "writing">;
+    get postWriting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl & {
+        source: any;
+    } & {
+        applications: import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>[];
+    }, "generatePackageJson">;
     getOtherScripts(): {
         'docker-compose': string;
         'ci:e2e:prepare': string;

package/dist/generators/workspaces/generator.js

@@ -1,4 +1,3 @@
-// @ts-nocheck
 /**
  * Copyright 2013-2024 the original author or authors from the JHipster project.
  *
@@ -26,6 +25,7 @@ export default class WorkspacesGenerator extends BaseWorkspacesGenerator {
     generateApplications;
     generateWith;
     entrypointGenerator;
+    dockerCompose;
     generateWorkspaces;
     workspacesConfig;
     async beforeQueue() {
@@ -130,10 +130,10 @@ export default class WorkspacesGenerator extends BaseWorkspacesGenerator {
     }
     get writing() {
         return this.asWritingTaskGroup({
-            async writing({ application }) {
+            async writing() {
                 await this.writeFiles({
                     blocks: [{ templates: ['.prettierignore.jhi.workspaces'] }],
-                    context: application,
+                    context: {},
                 });
             },
         });

package/dist/lib/application/field-types.d.ts

@@ -1,5 +1,6 @@
 import type { SetFieldType, SetRequired } from 'type-fest';
 import type { Field } from '../types/application/field.js';
+import type { Field as BaseField } from '../types/base/field.js';
 declare const blobFieldTypes: {
     readonly BLOB: "Blob";
     readonly ANY_BLOB: "AnyBlob";
@@ -38,4 +39,4 @@ export declare const isFieldBlobType: (field: Field) => field is SetFieldType<Fi
 export declare const isFieldBinaryType: (field: Field) => field is SetFieldType<Field, "fieldType", FieldBinaryType>;
 export declare const isFieldEnumType: (field: Field) => field is SetRequired<Field, "enumFileName" | "enumValues">;
 export declare const isFieldNotEnumType: (field: Field) => field is SetFieldType<Field, "fieldType", FieldType>;
-export declare const convertFieldBlobType: (field: Field) => Field;
+export declare const convertFieldBlobType: <const F extends BaseField = BaseField>(field: F) => F;

package/dist/lib/command/converter.d.ts

@@ -1,5 +1,9 @@
 import type { JHipsterOptionDefinition } from '../jdl/core/types/parsing.js';
-import type { ConfigSpec, JHipsterArguments, JHipsterConfigs, JHipsterOption } from './types.js';
-export declare const extractArgumentsFromConfigs: (configs: JHipsterConfigs | undefined) => JHipsterArguments;
+import type { ConfigSpec, JHipsterArguments, JHipsterConfigs, JHipsterOption, JHispterChoices } from './types.js';
+type JHipsterArgumentsWithChoices = JHipsterArguments & {
+    choices?: JHispterChoices;
+};
+export declare const extractArgumentsFromConfigs: (configs: JHipsterConfigs | undefined) => JHipsterArgumentsWithChoices;
 export declare const extractJdlDefinitionFromCommandConfig: (configs?: JHipsterConfigs) => JHipsterOptionDefinition[];
 export declare const convertConfigToOption: (name: string, config?: ConfigSpec<any>) => JHipsterOption | undefined;
+export {};

package/dist/lib/command/converter.js

@@ -8,6 +8,7 @@ export const extractArgumentsFromConfigs = (configs) => {
         {
             description: def.description,
             scope: def.scope,
+            choices: def.choices,
             ...def.argument,
         },
     ]));
@@ -21,14 +22,16 @@ export const extractJdlDefinitionFromCommandConfig = (configs = {}) => Object.en
 }))
     .sort((a, b) => (b.name.startsWith(a.name) ? 1 : a.name.localeCompare(b.name)));
 export const convertConfigToOption = (name, config) => {
-    if (!config?.cli?.type)
+    if (!config?.cli?.type && config?.internal !== true)
         return undefined;
     const choices = config.choices?.map(choice => (typeof choice === 'string' ? choice : choice.value));
     return {
         name,
+        default: config.default,
         description: config.description,
         choices,
         scope: config.scope ?? 'storage',
+        type: val => val,
         ...config.cli,
     };
 };

package/dist/lib/command/load.js

@@ -1,6 +1,7 @@
 import { upperFirst } from 'lodash-es';
 const prepareChoices = (key, choices) => choices
     .map(choice => (typeof choice === 'string' ? { value: choice } : choice))
+    .filter(choice => choice.value != null)
     .map(choice => ({ ...choice, choiceKey: `${key}${upperFirst(choice.value)}` }));
 const filteredScopeEntries = (commandsConfigs, scopes) => Object.entries(commandsConfigs).filter(([_key, def]) => scopes.includes(def.scope));
 function loadConfigIntoContext(options) {

package/dist/lib/command/lookup-commands-configs.js

@@ -1,25 +1,22 @@
 import { dirname, join } from 'path';
-import { fileURLToPath } from 'url';
+import { fileURLToPath, pathToFileURL } from 'url';
 import { glob } from 'glob';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const cwd = join(__dirname, '../..');
-let jdlConfigs;
+let jhipsterConfigs;
 export const lookupCommandsConfigs = async (options) => {
-    if (jdlConfigs) {
-        return jdlConfigs;
+    if (jhipsterConfigs) {
+        return jhipsterConfigs;
     }
     const { filter = () => true } = options ?? {};
-    jdlConfigs = {};
+    jhipsterConfigs = {};
     const files = [...(await glob('generators/*/index.{j,t}s', { cwd })), ...(await glob('generators/*/generators/*/index.{j,t}s', { cwd }))];
     for (const file of files) {
-        const index = await import(`${cwd}/${file}`);
-        const configs = index.command?.configs ?? {};
-        for (const [key, value] of Object.entries(configs)) {
-            if (filter(value)) {
-                jdlConfigs[key] = value;
-            }
+        const index = await import(pathToFileURL(`${cwd}/${file}`).toString());
+        if (index.command?.configs) {
+            Object.assign(jhipsterConfigs, index.command?.configs);
         }
     }
-    return jdlConfigs;
+    return Object.fromEntries(Object.entries(jhipsterConfigs).filter(([_key, value]) => filter(value)));
 };