Merge pull request jhipster#26758 from mshima/eslint-docker

ignore js files in docker folder.

generators/docker/files.js

@@ -4,6 +4,12 @@ const renameTo = (ctx, filepath) => `${ctx.dockerServicesDir}${filepath}`.replac
 
 // eslint-disable-next-line import/prefer-default-export
 export const dockerFiles = {
+  commonFiles: [
+    {
+      condition: ctx => ctx.eslintConfigFile,
+      templates: [{ sourceFile: 'eslint.config.js.jhi.docker', destinationFile: ctx => `${ctx.eslintConfigFile}.jhi.docker` }],
+    },
+  ],
   sqlDatabasesFiles: [
     {
       condition: ctx => ctx.dockerServices.some(service => ['postgresql', 'mariadb', 'mysql', 'mssql'].includes(service)),

generators/docker/templates/eslint.config.js.jhi.docker.ejs

@@ -0,0 +1,21 @@
+<%#
+ 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.
+-%>
+<&_ if (fragment.configSection) { -&>
+  { files: ['**/*.js'], ignores: ['<%- dockerServicesDir %>'] },
+<&_ } -&>

generators/javascript/generators/eslint/support/index.ts

@@ -0,0 +1 @@
+export * from './tasks.js';

generators/javascript/generators/eslint/support/tasks.ts

@@ -0,0 +1,32 @@
+/**
+ * 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.
+ */
+import { asWritingTask } from '../../../../base-application/support/task-type-inference.js';
+import { clientRootTemplatesBlock } from '../../../../client/support/files.js';
+
+export const writeEslintClientRootConfigFile = asWritingTask(async function writingEslintFile({ application }) {
+  await this.writeFiles({
+    blocks: [
+      clientRootTemplatesBlock({
+        templates: [{ sourceFile: 'eslint.config.js.jhi', destinationFile: ctx => `${ctx.eslintConfigFile}.jhi` }],
+      }),
+    ],
+    context: application,
+    rootTemplatesPath: this.fetchFromInstalledJHipster('javascript/generators/eslint/templates'),
+  });
+});

generators/react/generator.js

@@ -29,9 +29,9 @@ import {
   generateEntityClientImports as formatEntityClientImports,
   generateTestEntityId as getTestEntityId,
   generateTestEntityPrimaryKey as getTestEntityPrimaryKey,
-  clientRootTemplatesBlock,
 } from '../client/support/index.js';
 import { createNeedleCallback, upperFirstCamelCase } from '../base/support/index.js';
+import { writeEslintClientRootConfigFile } from '../javascript/generators/eslint/support/tasks.js';
 import { writeEntitiesFiles, postWriteEntitiesFiles, cleanupEntitiesFiles } from './entity-files-react.js';
 import cleanupOldFilesTask from './cleanup.js';
 import { writeFiles } from './files-react.js';
@@ -159,17 +159,7 @@ export default class ReactGenerator extends BaseApplicationGenerator {
         });
       },
       cleanupOldFilesTask,
-      async writingEslintFile({ application }) {
-        await this.writeFiles({
-          blocks: [
-            clientRootTemplatesBlock({
-              templates: [{ sourceFile: 'eslint.config.js.jhi', destinationFile: ctx => `${ctx.eslintConfigFile}.jhi` }],
-            }),
-          ],
-          context: application,
-          rootTemplatesPath: this.fetchFromInstalledJHipster('javascript/generators/eslint/templates'),
-        });
-      },
+      writeEslintClientRootConfigFile,
       writeFiles,
     });
   }