ESLint 9 (add dir for ignores)

jhipster · Sep 1, 2024 · 8f4be46 · 8f4be46
1 parent dc21090
commit 8f4be46
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/...n/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java b/...n/java/tech/jhipster/lite/generator/client/react/core/domain/ReactCoreModulesFactory.java
@@ -73,7 +73,7 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
  .addFile("tsconfig.json")
  .addTemplate("vite.config.ts")
  .addTemplate("vitest.config.ts")
- .addFile("eslint.config.js")
+ .addTemplate("eslint.config.js")
  .and()
  .batch(SOURCE_COMMON, to("."))
  .addFile(".npmrc")

diff --git a/src/main/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactory.java b/src/main/java/tech/jhipster/lite/generator/client/vue/core/domain/VueModulesFactory.java
@@ -83,7 +83,7 @@ public JHipsterModule buildVueModule(JHipsterModuleProperties properties) {
  .addScript(scriptKey("test:watch"), scriptCommand("vitest --"))
  .and()
  .files()
- .add(SOURCE.file("eslint.config.js"), to("eslint.config.js"))
+ .add(SOURCE.template("eslint.config.js.mustache"), to("eslint.config.js"))
  .add(SOURCE.file("tsconfig.json"), to("tsconfig.json"))
  .add(SOURCE.file("tsconfig.build.json"), to("tsconfig.build.json"))
  .add(SOURCE.template("webapp/app/http/AxiosHttp.ts.mustache"), MAIN_DESTINATION.append("http/AxiosHttp.ts"))

diff --git a/...ain/java/tech/jhipster/lite/generator/typescript/core/domain/TypescriptModuleFactory.java b/...ain/java/tech/jhipster/lite/generator/typescript/core/domain/TypescriptModuleFactory.java
@@ -43,7 +43,7 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
  .batch(SOURCE, to("."))
  .addFile("tsconfig.json")
  .addTemplate("vitest.config.ts")
- .addFile("eslint.config.js")
+ .addTemplate("eslint.config.js")
  .and()
  .and()
  .build();

diff --git a/...erator/client/react/core/eslint.config.js → ...ient/react/core/eslint.config.js.mustache b/...erator/client/react/core/eslint.config.js → ...ient/react/core/eslint.config.js.mustache
@@ -12,7 +12,7 @@ export default typescript.config(
  },
  },
  {
- ignores: ['src/main/docker/', 'jest.conf.js', 'src/test/webapp/jest.conf.js', 'postcss.config.js'],
+ ignores: ['src/main/docker/', 'jest.conf.js', 'src/test/webapp/jest.conf.js', 'postcss.config.js', '{{projectBuildDirectory}}/'],
  },
  eslint.configs.recommended,
  {

diff --git a/...ces/generator/client/vue/eslint.config.js → ...ator/client/vue/eslint.config.js.mustache b/...ces/generator/client/vue/eslint.config.js → ...ator/client/vue/eslint.config.js.mustache
@@ -12,7 +12,7 @@ export default typescript.config(
  },
  },
  {
- ignores: ['src/main/docker/', 'jest.conf.js', 'src/test/webapp/jest.conf.js', 'postcss.config.js'],
+ ignores: ['src/main/docker/', 'jest.conf.js', 'src/test/webapp/jest.conf.js', 'postcss.config.js', '{{projectBuildDirectory}}/'],
  },
  js.configs.recommended,
  ...typescript.configs.recommended.map(config => (config.name === 'typescript-eslint/base' ? config : { ...config, files: ['**/*.ts'] })),

diff --git a/...ces/generator/typescript/eslint.config.js → ...ator/typescript/eslint.config.js.mustache b/...ces/generator/typescript/eslint.config.js → ...ator/typescript/eslint.config.js.mustache
@@ -11,7 +11,7 @@ export default typescript.config(
  },
  },
  {
- ignores: ['src/main/docker/', 'jest.conf.js', 'src/test/webapp/jest.conf.js', 'postcss.config.js'],
+ ignores: ['src/main/docker/', 'jest.conf.js', 'src/test/webapp/jest.conf.js', 'postcss.config.js', '{{projectBuildDirectory}}/'],
  },
  js.configs.recommended,
  ...typescript.configs.recommended.map(config => (config.name === 'typescript-eslint/base' ? config : { ...config, files: ['**/*.ts'] })),