refactor(svelte): reuse npm dependencies from common source

jhipster · Oct 2, 2024 · 0b9de52 · 0b9de52
1 parent 9a02431
commit 0b9de52
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 21 deletions.
diff --git a/...main/java/tech/jhipster/lite/generator/client/svelte/core/domain/SvelteModuleFactory.java b/...main/java/tech/jhipster/lite/generator/client/svelte/core/domain/SvelteModuleFactory.java
@@ -47,7 +47,6 @@ public JHipsterModule buildSvelteModule(JHipsterModuleProperties properties) {
         .pattern("!.env.test")
       .and()
       .packageJson()
-        .addDevDependency(packageName("@eslint/js"), SVELTE)
         .addDevDependency(packageName("@sveltejs/adapter-static"), SVELTE)
         .addDevDependency(packageName("@sveltejs/kit"), SVELTE)
         .addDevDependency(packageName("@sveltejs/vite-plugin-svelte"), SVELTE)
@@ -57,19 +56,19 @@ public JHipsterModule buildSvelteModule(JHipsterModuleProperties properties) {
         .addDevDependency(packageName("@vitest/coverage-v8"), SVELTE)
         .addDevDependency(packageName("@vitest/ui"), SVELTE)
         .addDevDependency(packageName("@types/eslint"), SVELTE)
-        .addDevDependency(packageName("eslint"), SVELTE)
-        .addDevDependency(packageName("eslint-config-prettier"), SVELTE)
+        .addDevDependency(packageName("eslint"), COMMON)
+        .addDevDependency(packageName("eslint-config-prettier"), COMMON)
         .addDevDependency(packageName("eslint-plugin-svelte"), SVELTE)
-        .addDevDependency(packageName("globals"), SVELTE)
-        .addDevDependency(packageName("jsdom"), SVELTE)
+        .addDevDependency(packageName("globals"), COMMON)
+        .addDevDependency(packageName("jsdom"), COMMON)
         .addDevDependency(packageName("prettier-plugin-organize-imports"), SVELTE)
         .addDevDependency(packageName("prettier-plugin-svelte"), SVELTE)
         .addDevDependency(packageName("svelte"), SVELTE)
         .addDevDependency(packageName("svelte-check"), SVELTE)
-        .addDevDependency(packageName("typescript"), SVELTE)
-        .addDevDependency(packageName("vite"), SVELTE)
-        .addDevDependency(packageName("vitest"), SVELTE)
-        .addDevDependency(packageName("vitest-sonar-reporter"), SVELTE)
+        .addDevDependency(packageName("typescript"), COMMON)
+        .addDevDependency(packageName("vite"), COMMON)
+        .addDevDependency(packageName("vitest"), COMMON)
+        .addDevDependency(packageName("vitest-sonar-reporter"), COMMON)
         .addScript(scriptKey("start"), scriptCommand("vite dev --port 9000 --open"))
         .addScript(scriptKey("build"), scriptCommand("vite build"))
         .addScript(scriptKey("preview"), scriptCommand("vite preview"))

diff --git a/src/main/resources/generator/dependencies/svelte/package.json b/src/main/resources/generator/dependencies/svelte/package.json
@@ -3,7 +3,6 @@
   "version": "0.0.1",
   "type": "module",
   "devDependencies": {
-    "@eslint/js": "9.11.0",
     "@sveltejs/adapter-static": "3.0.5",
     "@sveltejs/kit": "2.5.28",
     "@sveltejs/vite-plugin-svelte": "3.1.2",
@@ -13,18 +12,10 @@
     "@types/eslint": "9.6.1",
     "@vitest/coverage-v8": "2.1.1",
     "@vitest/ui": "2.1.1",
-    "eslint": "9.10.0",
-    "eslint-config-prettier": "9.1.0",
     "eslint-plugin-svelte": "2.44.0",
-    "globals": "15.9.0",
-    "jsdom": "25.0.1",
     "prettier-plugin-organize-imports": "4.1.0",
     "prettier-plugin-svelte": "3.2.6",
     "svelte": "4.2.19",
-    "svelte-check": "4.0.2",
-    "typescript": "5.6.2",
-    "vite": "5.4.7",
-    "vitest": "2.1.1",
-    "vitest-sonar-reporter": "2.0.0"
+    "svelte-check": "4.0.2"
   }
 }
diff --git a/.../java/tech/jhipster/lite/generator/client/svelte/core/domain/SvelteModuleFactoryTest.java b/.../java/tech/jhipster/lite/generator/client/svelte/core/domain/SvelteModuleFactoryTest.java
@@ -1,6 +1,12 @@
 package tech.jhipster.lite.generator.client.svelte.core.domain;
 
-import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*;
+import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.ModuleFile;
+import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.assertThatModuleWithFiles;
+import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.file;
+import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.lintStagedConfigFile;
+import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.nodeDependency;
+import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.nodeScript;
+import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.packageJsonFile;
 
 import org.junit.jupiter.api.Test;
 import tech.jhipster.lite.TestFileUtils;
@@ -33,7 +39,6 @@ void shouldCreateSvelteModule() {
           """)
         .and()
       .hasFile("package.json")
-        .containing(nodeDependency("@eslint/js"))
         .containing(nodeDependency("@sveltejs/adapter-static"))
         .containing(nodeDependency("@sveltejs/kit"))
         .containing(nodeDependency("@sveltejs/vite-plugin-svelte"))