generator-jhipster 8.7.1 → 8.7.3

package/dist/generators/generate-blueprint/generator.js

@@ -17,6 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { rm } from 'node:fs/promises';
 import chalk from 'chalk';
 import { camelCase, snakeCase, upperFirst } from 'lodash-es';
 import BaseGenerator from '../base-application/index.js';
@@ -30,6 +31,9 @@ const { GENERATOR_PROJECT_NAME, GENERATOR_INIT } = GENERATOR_LIST;
 const defaultPublishedFiles = ['generators', '!**/__*', '!**/*.snap', '!**/*.spec.?(c|m)js'];
 export default class extends BaseGenerator {
     application;
+    recreatePackageLock;
+    skipWorkflows;
+    ignoreExistingGenerators;
     async _beforeQueue() {
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints();
@@ -110,6 +114,9 @@ export default class extends BaseGenerator {
     }
     get composing() {
         return this.asComposingTaskGroup({
+            storeCurrentVersion() {
+                this.storeCurrentJHipsterVersion();
+            },
             async compose() {
                 if (this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION])
                     return;
@@ -152,9 +159,10 @@ export default class extends BaseGenerator {
             preparePath() {
                 this.application.blueprintsPath = this.application[LOCAL_BLUEPRINT_OPTION] ? '.blueprint/' : 'generators/';
             },
-            prepare() {
+            prepare({ application }) {
                 const { cli, cliName, baseName } = this.application;
                 this.application.githubRepository = this.jhipsterConfig.githubRepository ?? `jhipster/generator-jhipster-${baseName}`;
+                application.blueprintMjsExtension = this.application.js ? 'js' : 'mjs';
                 if (cli) {
                     this.application.cliName = cliName ?? `jhipster-${baseName}`;
                 }
@@ -167,19 +175,29 @@ export default class extends BaseGenerator {
     get writing() {
         return this.asWritingTaskGroup({
             async cleanup({ control }) {
-                await control.cleanupFiles({ '8.5.1': ['.eslintrc.json'] });
+                await control.cleanupFiles({
+                    '8.5.1': ['.eslintrc.json'],
+                    '8.7.2': ['.eslintignore', 'vitest.test-setup.ts'],
+                });
             },
-            async writing() {
+            async writing({ application }) {
                 this.application.sampleWritten = this.jhipsterConfig.sampleWritten;
+                const { skipWorkflows, ignoreExistingGenerators } = this;
                 await this.writeFiles({
                     sections: files,
-                    context: this.application,
+                    context: {
+                        ...application,
+                        skipWorkflows,
+                        ignoreExistingGenerators,
+                        ...this.application,
+                    },
                 });
                 this.jhipsterConfig.sampleWritten = true;
             },
-            async writingGenerators() {
+            async writingGenerators({ application }) {
                 if (!this.application[GENERATORS])
                     return;
+                const { skipWorkflows, ignoreExistingGenerators } = this;
                 for (const generator of Object.keys(this.application[GENERATORS])) {
                     const subGeneratorStorage = this.getSubGeneratorStorage(generator);
                     const subGeneratorConfig = subGeneratorStorage.getAll();
@@ -191,7 +209,9 @@ export default class extends BaseGenerator {
                     const customGenerator = !Object.values(GENERATOR_LIST).includes(generator);
                     const jhipsterGenerator = customGenerator || subGeneratorConfig.sbs ? 'base-application' : generator;
                     const subTemplateData = {
-                        js: this.application.js,
+                        ...application,
+                        skipWorkflows,
+                        ignoreExistingGenerators,
                         application: this.application,
                         ...defaultSubGeneratorConfig(),
                         ...subGeneratorConfig,
@@ -216,6 +236,26 @@ export default class extends BaseGenerator {
     }
     get postWriting() {
         return this.asPostWritingTaskGroup({
+            upgrade({ application }) {
+                if (!this.application[GENERATORS])
+                    return;
+                if (!this.isJhipsterVersionLessThan('8.7.2'))
+                    return;
+                for (const generator of Object.keys(this.application[GENERATORS])) {
+                    const commandFile = `${this.application.blueprintsPath}${generator}/command.${application.blueprintMjsExtension}`;
+                    this.editFile(commandFile, content => content
+                        .replace(`/**
+ * @type {import('generator-jhipster').JHipsterCommandDefinition}
+ */`, `import { asCommand } from 'generator-jhipster';
+`)
+                        .replace('const command = ', 'export default asCommand(')
+                        .replace(`
+};`, '});')
+                        .replace('export default command;', ''));
+                    const generatorSpec = `${this.application.blueprintsPath}${generator}/generator.spec.${application.blueprintMjsExtension}`;
+                    this.editFile(generatorSpec, content => content.replaceAll(/blueprint: '([\w-]*)'/g, "blueprint: ['$1']"));
+                }
+            },
             packageJson() {
                 if (this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION])
                     return;
@@ -270,27 +310,23 @@ export default class extends BaseGenerator {
                 if (this.jhipsterConfig[LOCAL_BLUEPRINT_OPTION])
                     return;
                 const { packagejs } = this.application;
+                const exactDependency = {
+                    'generator-jhipster': `${packagejs.version}`,
+                };
+                const caretDependency = {
+                    'generator-jhipster': `^${packagejs.version}`,
+                };
                 if (this.jhipsterConfig.dynamic) {
                     this.packageJson.merge({
-                        devDependencies: {
-                            'generator-jhipster': `${packagejs.version}`,
-                        },
-                        peerDependencies: {
-                            'generator-jhipster': `^${packagejs.version}`,
-                        },
-                        engines: {
-                            'generator-jhipster': `^${packagejs.version}`,
-                        },
+                        devDependencies: exactDependency,
+                        peerDependencies: caretDependency,
+                        engines: caretDependency,
                     });
                 }
                 else {
                     this.packageJson.merge({
-                        dependencies: {
-                            'generator-jhipster': `${packagejs.version}`,
-                        },
-                        engines: {
-                            'generator-jhipster': `${packagejs.version}`,
-                        },
+                        dependencies: exactDependency,
+                        engines: this.jhipsterConfig.caret ? caretDependency : exactDependency,
                     });
                 }
             },
@@ -301,11 +337,16 @@ export default class extends BaseGenerator {
     }
     get postInstall() {
         return this.asPostInstallTaskGroup({
-            async addSnapshot() {
+            async addSnapshot({ control }) {
                 const { [LOCAL_BLUEPRINT_OPTION]: localBlueprint } = this.jhipsterConfig;
                 const { skipInstall, skipGit, existed, [GENERATE_SNAPSHOTS]: generateSnapshots = !localBlueprint && !skipInstall && !skipGit && !existed, } = this.options;
                 if (!generateSnapshots)
                     return;
+                if (this.recreatePackageLock) {
+                    await rm(this.destinationPath('package-lock.json'), { force: true });
+                    await rm(this.destinationPath('node_modules'), { force: true, recursive: true });
+                    await this.spawnCommand('npm', ['install'], { stdio: 'inherit' });
+                }
                 try {
                     if (this.options[LINK_JHIPSTER_DEPENDENCY]) {
                         this.log.verboseInfo('Linking generator-jhipster');
@@ -323,6 +364,21 @@ This is a new blueprint, executing '${chalk.yellow('npm run update-snapshot')}'
                     }
                     this.log.warn('Fail to generate snapshots');
                 }
+                if (control.jhipsterOldVersion) {
+                    // Apply prettier and eslint to fix non generated files on upgrade.
+                    try {
+                        await this.spawnCommand('npm', ['run', 'prettier-format']);
+                    }
+                    catch {
+                        // Ignore error
+                    }
+                    try {
+                        await this.spawnCommand('npm', ['run', 'lint-fix']);
+                    }
+                    catch {
+                        // Ignore error
+                    }
+                }
             },
         });
     }

package/dist/generators/generate-blueprint/resources/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "eslint": "9.10.0",
-    "globals": "15.9.0",
-    "vitest": "2.1.1"
+    "eslint": "9.13.0",
+    "globals": "15.11.0",
+    "vitest": "2.1.4"
   }
 }

package/dist/generators/generate-blueprint/templates/.github/workflows/samples.yml.ejs

@@ -26,7 +26,7 @@ jobs:
           npm install
           ./cli/cli.cjs github-build-matrix
   samples:
-    name: ${{ matrix.sample-name }}
+    name: ${{ matrix.job-name || matrix.sample-name }}
     runs-on: ubuntu-latest
     needs: build-matrix
     defaults:
@@ -48,11 +48,9 @@ jobs:
           maven-cache: true
           gradle-cache: true
           binary-dir: ${{ github.workspace }}/generator-jhipster-<%= baseName %>/cli/
-      - name: 'Install blueprint'
-        run: npm install
+      - run: npm install
         working-directory: ${{ github.workspace }}/generator-jhipster-<%= baseName %>
-      - name: 'Generate Project'
-        run: cli.cjs generate-sample ${{ matrix.sample-name }} --skip-jhipster-dependencies --force
+      - run: cli.cjs generate-sample ${{ matrix.sample-name }} --skip-jhipster-dependencies ${{ matrix.extra-args }}
       - uses: jhipster/actions/compare-sample@v0
         id: compare
         if: >-
@@ -60,7 +58,7 @@ jobs:
           !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare')
         with:
           generator-path: generator-jhipster-<%= baseName %>
-          cmd: cli.cjs generate-sample ${{ matrix.sample-name }} --skip-jhipster-dependencies --force --skip-install
+          cmd: cli.cjs generate-sample ${{ matrix.sample-name }} --skip-jhipster-dependencies --skip-install ${{ matrix.extra-args }}
       - run: npm run ci:backend:test
         if: steps.compare.outputs.equals != 'true'
         id: backend
@@ -73,7 +71,7 @@ jobs:
       - run: npm run ci:e2e:run --if-present
         if: steps.compare.outputs.equals != 'true'
         id: e2e
-      - name: 'BACKEND: Store failure logs'
+      - name: Store backend test failure logs
         uses: actions/upload-artifact@v4
         if: always() && steps.backend.outcome == 'failure'
         with:
@@ -81,7 +79,7 @@ jobs:
           path: |
             ${{ github.workspace }}/app/build/test-results/**/*.xml
             ${{ github.workspace }}/app/target/surefire-reports
-      - name: 'E2E: Store failure screenshots'
+      - name: Store cypress screenshots
         uses: actions/upload-artifact@v4
         if: always() && steps.e2e.outcome == 'failure'
         with:

package/dist/generators/generate-blueprint/templates/README.md.ejs

@@ -46,13 +46,23 @@ npm install -g generator-jhipster-<%= baseName %>
 
 To use this blueprint, run the below command
 
-```bash
 <%_ if (cli) { _%>
+```bash
 <%= cliName %>
+  <%_ if (caret) { _%>
+```
+
+or
+
+```bash
+jhipster --blueprints <%= baseName %>
+```
+  <%_ } _%>
 <%_ } else { _%>
+```bash
 jhipster --blueprints <%= baseName %>
-<%_ } _%>
 ```
+<%_ } _%>
 
 You can look for updated <%= baseName %> blueprint specific options by running
 

package/dist/generators/generate-blueprint/templates/cli/cli-customizations.cjs.ejs

@@ -0,0 +1,2 @@
+// This file will not be overwritten by generate-blueprint
+module.exports = {};

package/dist/generators/generate-blueprint/templates/cli/cli.cjs.ejs

@@ -23,10 +23,11 @@ const blueprint = packageFolderName.startsWith('jhipster-') ? `generator-${packa
       [blueprint]: version,
     },
     printBlueprintLogo: () => {
-      console.log('===================== JHipster <%= baseName %> =====================');
+      console.log('===================== JHipster <%= humanizedBaseName %> =====================');
       console.log('');
     },
     lookups: [{ packagePaths: [packagePath] }],
+    ...require('./cli-customizations.cjs'),
   }).catch(done);
 
   process.on('unhandledRejection', up => {

package/dist/generators/generate-blueprint/templates/cli/commands.cjs.ejs

@@ -19,7 +19,7 @@
 module.exports = {
 <% for (const command of commands) { %>
   '<%= command %>': {
-    description: 'Run <%= command %> sub-generator (<%= baseName %> blueprint)',
+    desc: 'Run <%= command %> sub-generator (<%= baseName %> blueprint)',
     blueprint: 'generator-jhipster-<%= baseName %>',
   },
 <% } %>

package/dist/generators/generate-blueprint/templates/eslint.config.js.jhi.blueprint.ejs

@@ -17,8 +17,9 @@
  limitations under the License.
 -%>
 <&_ if (fragment.importsSection) { -&>
-import jhipster from 'generator-jhipster/eslint/recommended';
+import jhipster from 'generator-jhipster/eslint';
 <&_ } -&>
 <&_ if (fragment.configSection) { -&>
-  jhipster,
+  { ignores: ['coverage/**'] },
+  jhipster.recommended,
 <&_ } -&>

package/dist/generators/generate-blueprint/templates/generators/generator/command.mjs.ejs

@@ -16,29 +16,25 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
+import { asCommand } from 'generator-jhipster';
 <%_ if (!sbs && !customGenerator) { _%>
 import { command as jhipsterCommand } from 'generator-jhipster/generators/<%- subGenerator %>';
-
 <%_ } _%>
-/**
- * @type {import('generator-jhipster').JHipsterCommandDefinition}
- */
-const command = {
-  options: {
+
+export default asCommand({
 <%_ if (!sbs && !customGenerator) { _%>
+  options: {
     ...jhipsterCommand.options,
-<%_ } _%>
   },
+<%_ } _%>
   configs: {
 <%_ if (!sbs && !customGenerator) { _%>
     ...jhipsterCommand.configs,
 <%_ } _%>
   },
-  arguments: {
 <%_ if (!sbs && !customGenerator) { _%>
+  arguments: {
     ...jhipsterCommand.arguments,
-<%_ } _%>
   },
-};
-
-export default command;
+<%_ } _%>
+});

package/dist/generators/generate-blueprint/templates/generators/generator/generator.mjs.jhi.ejs

@@ -28,7 +28,7 @@
 import <%= generatorClass %>Generator from 'generator-jhipster/generators/<%= jhipsterGenerator %>';
 <%_ } _%>
 <%_ if (priorities.find(priority => priority.name === 'initializing')) { _%>
-import command from './command.<%- js ? '' : 'm' %>js';
+import command from './command.<%- blueprintMjsExtension %>';
 <%_ } _%>
 
 <%_ if (application.dynamic) { _%>
@@ -48,21 +48,21 @@ export async function createGenerator(env) {
 <%_ } else { _%>
 export default class extends <%= generatorClass %>Generator {
 <%_ } _%>
-<%_ if (sbs) { _%>
-  constructor(args, opts, features) {
-    super(args, opts, { ...features, sbsBlueprint: true });
-  }
-
-<%_ } else if (!customGenerator) { _%>
   constructor(args, opts, features) {
     super(args, opts, {
       ...features,
+      queueCommandTasks: true,
+<%_ if (sbs) { _%>
+      sbsBlueprint: true,
+<%_ } else if (!customGenerator) { _%>
       checkBlueprint: true,
       // Dropped it once migration is done.
       jhipster7Migration: true,
+<%_ } _%>
     });
   }
 
+<%_ if (!sbs && !customGenerator) { _%>
   async beforeQueue() {
     await super.beforeQueue();
   }
@@ -82,10 +82,7 @@ export default class extends <%= generatorClass %>Generator {
         { application }
   <%_ } _%>
       ) {
-  <%_ if (priority.name === 'initializing') { _%>
-        this.parseJHipsterArguments(command.arguments);
-        this.parseJHipsterOptions(command.options);
-  <%_ } else if (priority.name === 'writing') { _%>
+  <%_ if (priority.name === 'writing') { _%>
         await this.writeFiles({
           sections: {
             files: [

package/dist/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs

@@ -36,13 +36,13 @@ describe('SubGenerator <%= subGenerator %> of <%= application.baseName %> JHipst
         .withOptions({
           ignoreNeedlesError: true,
 <%_ if (!customGenerator) { _%>
-          blueprint: '<%= application.baseName %>',
+          blueprint: ['<%= application.baseName %>'],
 <%_ } _%>
 <%_ if (subGenerator === 'jdl') { _%>
           inline: 'application { }',
 <%_ } _%>
         })
-        .withJHipsterLookup()
+        .withJHipsterGenerators()
         .withParentBlueprintLookup();
     });
 

package/dist/generators/generate-blueprint/templates/generators/generator/index.mjs.ejs

@@ -16,7 +16,5 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-export { <%- application.dynamic ? 'createGenerator' : 'default' %> } from './generator.<%- js ? '' : 'm' %>js';
-<%_ if (priorities.find(priority => priority.name === 'initializing')) { _%>
-export { default as command } from './command.<%- js ? '' : 'm' %>js';
-<%_ } _%>
+export { <%- application.dynamic ? 'createGenerator' : 'default' %> } from './generator.<%- blueprintMjsExtension %>';
+export { default as command } from './command.<%- blueprintMjsExtension %>';

package/dist/generators/generate-blueprint/templates/vitest.config.ts.ejs

@@ -5,6 +5,5 @@ export default defineConfig({
     pool: 'forks',
     hookTimeout: 20000,
     exclude: [...defaultExclude.filter(val => val !== '**/cypress/**'), '**/templates/**', '**/resources/**'],
-    setupFiles: ['./vitest.test-setup.ts'],
   },
 });

package/dist/generators/generator-constants.d.ts

@@ -1,11 +1,11 @@
 export const BLUEPRINT_API_VERSION: "jhipster-8";
-export const JHIPSTER_DEPENDENCIES_VERSION: "8.7.1";
+export const JHIPSTER_DEPENDENCIES_VERSION: "8.7.2";
 export const JAVA_VERSION: "17";
 export const JAVA_COMPATIBLE_VERSIONS: string[];
 export const ADD_SPRING_MILESTONE_REPOSITORY: false;
 export const NODE_VERSION: string;
 export const OPENAPI_GENERATOR_CLI_VERSION: "2.13.1";
-export const ELASTICSEARCH_TAG: "8.10.4";
+export const ELASTICSEARCH_TAG: "8.13.4";
 export const ELASTICSEARCH_IMAGE: "docker.elastic.co/elasticsearch/elasticsearch";
 /**
  * @type {Record<string, string>}

package/dist/generators/generator-constants.js

@@ -21,18 +21,18 @@ import { join } from 'path';
 import { fileURLToPath } from 'url';
 export const BLUEPRINT_API_VERSION = 'jhipster-8';
 // jhipster-bom version
-export const JHIPSTER_DEPENDENCIES_VERSION = '8.7.1';
+export const JHIPSTER_DEPENDENCIES_VERSION = '8.7.2';
 // Version of Java
 export const JAVA_VERSION = '17';
 // Supported Java versions, https://www.oracle.com/java/technologies/java-se-support-roadmap.html
-export const JAVA_COMPATIBLE_VERSIONS = ['17', '21', '22'];
+export const JAVA_COMPATIBLE_VERSIONS = ['17', '21', '23'];
 // Force spring milestone repository. Spring Boot milestones are detected.
 export const ADD_SPRING_MILESTONE_REPOSITORY = false;
 // Version of Node, NPM
 export const NODE_VERSION = readFileSync(join(fileURLToPath(import.meta.url), '../init/resources/.node-version'), 'utf-8').trim();
 export const OPENAPI_GENERATOR_CLI_VERSION = '2.13.1';
 // The version should be coherent with the one from spring-data-elasticsearch project
-export const ELASTICSEARCH_TAG = '8.10.4';
+export const ELASTICSEARCH_TAG = '8.13.4';
 export const ELASTICSEARCH_IMAGE = 'docker.elastic.co/elasticsearch/elasticsearch';
 /**
  * @type {Record<string, string>}

package/dist/generators/git/command.d.ts

@@ -14,6 +14,16 @@ declare const command: {
             };
             readonly scope: "generator";
         };
+        readonly commitMsg: {
+            readonly description: "Commit changes (implies forceGit)";
+            readonly cli: {
+                readonly type: StringConstructor;
+                readonly implies: {
+                    readonly forceGit: true;
+                };
+            };
+            readonly scope: "generator";
+        };
         readonly monorepository: {
             readonly description: "Use monorepository";
             readonly cli: {

package/dist/generators/git/command.js

@@ -14,6 +14,16 @@ const command = {
             },
             scope: 'generator',
         },
+        commitMsg: {
+            description: 'Commit changes (implies forceGit)',
+            cli: {
+                type: String,
+                implies: {
+                    forceGit: true,
+                },
+            },
+            scope: 'generator',
+        },
         monorepository: {
             description: 'Use monorepository',
             cli: {

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

@@ -22,10 +22,11 @@ import BaseGenerator from '../base/index.js';
  * @extends {BaseGenerator}
  */
 export default class GitGenerator extends BaseGenerator {
-    gitInitialized: any;
-    skipGit: any;
-    forceGit: any;
-    existingRepository: any;
+    gitInitialized: boolean;
+    skipGit: boolean;
+    forceGit: boolean;
+    existingRepository: boolean;
+    commitMsg: string;
     beforeQueue(): Promise<void>;
     get initializing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "checkGit" | "initializeMonorepository">;
     get preparing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithSource<any>, "preparing">;

package/dist/generators/git/generator.js

@@ -28,6 +28,7 @@ export default class GitGenerator extends BaseGenerator {
     skipGit;
     forceGit;
     existingRepository;
+    commitMsg;
     async beforeQueue() {
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints();
@@ -118,14 +119,15 @@ export default class GitGenerator extends BaseGenerator {
                         }
                     }
                     try {
-                        let commitMsg = existingApplication
-                            ? `Regenerated ${this.jhipsterConfig.baseName} using generator-jhipster@${this.jhipsterConfig.jhipsterVersion}`
-                            : `Initial version of ${this.jhipsterConfig.baseName} generated by generator-jhipster@${this.jhipsterConfig.jhipsterVersion}`;
+                        let commitMsg = this.commitMsg ??
+                            (existingApplication
+                                ? `Regenerated ${this.jhipsterConfig.baseName} using generator-jhipster@${this.jhipsterConfig.jhipsterVersion}`
+                                : `Initial version of ${this.jhipsterConfig.baseName} generated by generator-jhipster@${this.jhipsterConfig.jhipsterVersion}`);
                         if (this.jhipsterConfig.blueprints && this.jhipsterConfig.blueprints.length > 0) {
                             const bpInfo = this.jhipsterConfig.blueprints.map(bp => `${bp.name}@${bp.version}`).join(', ');
                             commitMsg += ` with blueprints ${bpInfo}`;
                         }
-                        await git.add(['.']).commit(commitMsg, { '--allow-empty': null });
+                        await git.add(['.']).commit(commitMsg, { '--allow-empty': null, '--no-verify': null });
                         this.log.ok(`Application successfully committed to Git from ${repositoryRoot}.`);
                     }
                     catch (e) {

package/dist/generators/gradle/generators/node-gradle/templates/buildSrc/src/main/groovy/jhipster.node-gradle-conventions.gradle.ejs

@@ -66,23 +66,29 @@ task webapp_test(type: NpmTask) {
     inputs.files("tsconfig.json", "tsconfig.app.json")
         .withPropertyName("tsconfig")
         .withPathSensitivity(PathSensitivity.RELATIVE)
-    <%_ if (microfrontend) { _%>
 
-    def webpackDevFiles = fileTree("<%= CLIENT_WEBPACK_DIR %>")
-    webpackDevFiles.exclude("webpack.prod.js")
-    inputs.files(webpackDevFiles)
-        .withPropertyName("webpack-dir")
+    inputs.files(".postcssrc")
+        .withPropertyName("postcssrc")
         .withPathSensitivity(PathSensitivity.RELATIVE)
-    <%_ } else { _%>
+  <%_ } _%>
+  <%_ if (clientBundlerVite && clientFrameworkBuiltIn) { _%>
 
-    inputs.files("vite.config.ts")
+    inputs.files("vite.config.mts")
         .withPropertyName("vite")
         .withPathSensitivity(PathSensitivity.RELATIVE)
+  <%_ } _%>
+  <%_ if (clientFrameworkVue) { _%>
+    <%_ if (clientBundlerWebpack) { _%>
+    def webpackDevFiles = fileTree("<%= CLIENT_WEBPACK_DIR %>")
+    webpackDevFiles.exclude("webpack.prod.js")
+    inputs.files(webpackDevFiles)
+        .withPropertyName("webpack-dir")
     <%_ } _%>
-
-    inputs.files(".postcssrc")
-        .withPropertyName("postcssrc")
+    <%_ if (microfrontend) { _%>
+    inputs.files("module-federation.config.cjs")
+        .withPropertyName("module-federation")
         .withPathSensitivity(PathSensitivity.RELATIVE)
+    <%_ } _%>
   <%_ } _%>
 
     outputs.dir("build/test-results/jest/")

package/dist/generators/gradle/internal/needles.d.ts

@@ -6,7 +6,9 @@ export declare const addGradleDependenciesCallback: (dependencies: GradleDepende
 /** @deprecated use addGradleDependenciesCallback */
 export declare const addGradleBuildSrcDependencyCallback: (dependency: GradleDependency) => import("../../base/api.js").EditFileCallback<import("../../index.js").GeneratorBaseCore>;
 export declare const addGradleDependenciesCatalogVersionCallback: (versions: GradleTomlVersion[]) => import("../../base/api.js").EditFileCallback<import("../../index.js").GeneratorBaseCore>;
-export declare const addGradleDependencyCatalogLibrariesCallback: (libraries: GradleLibraryDependency[]) => import("../../base/api.js").EditFileCallback<import("../../index.js").GeneratorBaseCore>;
+export declare const addGradleDependencyCatalogLibrariesCallback: (libraries: (GradleLibraryDependency & {
+    closure?: string[];
+})[]) => import("../../base/api.js").EditFileCallback<import("../../index.js").GeneratorBaseCore>;
 export declare const addGradleDependencyCatalogPluginsCallback: (plugins: GradleTomlPlugin[]) => import("../../base/api.js").EditFileCallback<import("../../index.js").GeneratorBaseCore>;
 export declare const addGradlePluginFromCatalogCallback: (plugins: GradleTomlPlugin[]) => import("../../base/api.js").EditFileCallback<import("../../index.js").GeneratorBaseCore>;
 /** @deprecated use addGradleDependenciesCatalogVersionCallback */

package/dist/generators/gradle/internal/needles.js

@@ -30,15 +30,20 @@ const scopeSortOrder = {
     testImplementation: 5,
     testRuntimeOnly: 6,
 };
-const wrapScope = (scope, dependency) => `${scope}${scope === 'implementation platform' ? '(' : ' '}${dependency}${scope === 'implementation platform' ? ')' : ''}`;
+const wrapScope = (scope, dependency, closure) => {
+    if (closure?.length || scope === 'implementation platform') {
+        return `${scope}(${dependency})${closure?.length ? ` {\n${closure.join('\n')}\n}` : ''}`;
+    }
+    return `${scope} ${dependency}`;
+};
 const serializeDependency = (dependency) => {
     if ('libraryName' in dependency) {
-        return wrapScope(dependency.scope, `libs.${gradleNameToReference(dependency.libraryName)}`);
+        return wrapScope(dependency.scope, `libs.${gradleNameToReference(dependency.libraryName)}`, dependency.closure);
     }
-    const { groupId, artifactId, version, classifier, scope } = dependency;
+    const { groupId, artifactId, version, classifier, scope, closure } = dependency;
     return wrapScope(scope, classifier && !version
         ? `group: "${groupId}", name: "${artifactId}", classifier: "${classifier}"`
-        : `"${groupId}:${artifactId}${version ? `:${version}` : ''}${classifier ? `:${classifier}` : ''}"`);
+        : `"${groupId}:${artifactId}${version ? `:${version}` : ''}${classifier ? `:${classifier}` : ''}"`, closure);
 };
 export const gradleNeedleOptionsWithDefaults = (options) => {
     const { gradleFile = 'build.gradle', gradleVersionCatalogFile = 'gradle/libs.versions.toml' } = options;
@@ -92,7 +97,7 @@ export const addGradleDependenciesCatalogVersionCallback = (versions) => createN
 });
 export const addGradleDependencyCatalogLibrariesCallback = (libraries) => createNeedleCallback({
     needle: 'gradle-dependency-catalog-libraries',
-    contentToAdd: libraries.map(({ libraryName, scope: _scope, ...others }) => 'library' in others ? `${libraryName} = "${others.library}"` : `${libraryName} = ${tomlItemToString(others)}`),
+    contentToAdd: libraries.map(({ libraryName, scope: _scope, closure: _closure, ...others }) => 'library' in others ? `${libraryName} = "${others.library}"` : `${libraryName} = ${tomlItemToString(others)}`),
 });
 export const addGradleDependencyCatalogPluginsCallback = (plugins) => createNeedleCallback({
     needle: 'gradle-dependency-catalog-plugins',