Skip to content

Commit

Permalink
chore(react): remove duplicated dependencies and scripts already mana…
Browse files Browse the repository at this point in the history
…ged by the typescript module
  • Loading branch information
murdos committed Sep 19, 2024
1 parent 57cfea3 commit 53623a3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import static tech.jhipster.lite.module.domain.JHipsterModule.*;
import static tech.jhipster.lite.module.domain.npm.JHLiteNpmVersionSource.COMMON;
import static tech.jhipster.lite.module.domain.npm.JHLiteNpmVersionSource.REACT;
import static tech.jhipster.lite.module.domain.packagejson.NodeModuleFormat.MODULE;

import java.util.function.Consumer;
import tech.jhipster.lite.module.domain.Indentation;
Expand Down Expand Up @@ -37,43 +36,27 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
return moduleBuilder(properties)
.preCommitActions(stagedFilesFilter("{src/**/,}*.{ts,tsx}"), preCommitCommands("eslint --fix", "prettier --write"))
.packageJson()
.type(MODULE)
.removeDevDependency(packageName("@tsconfig/recommended"))
.addDevDependency(packageName("@testing-library/dom"), REACT)
.addDevDependency(packageName("@testing-library/react"), REACT)
.addDevDependency(packageName("@types/node"), COMMON)
.addDevDependency(packageName("@types/react"), REACT)
.addDevDependency(packageName("@types/react-dom"), REACT)
.addDevDependency(packageName("@tsconfig/vite-react"), REACT)
.addDevDependency(packageName("@typescript-eslint/eslint-plugin"), COMMON)
.addDevDependency(packageName("@vitejs/plugin-react"), REACT)
.addDevDependency(packageName("@vitest/coverage-istanbul"), COMMON)
.addDevDependency(packageName("typescript-eslint"), COMMON)
.addDevDependency(packageName("globals"), COMMON)
.addDevDependency(packageName("eslint"), COMMON)
.addDevDependency(packageName("eslint-plugin-react"), REACT)
.addDevDependency(packageName("jsdom"), COMMON)
.addDevDependency(packageName("typescript"), COMMON)
.addDevDependency(packageName("ts-node"), REACT)
.addDevDependency(packageName("vite"), COMMON)
.addDevDependency(packageName("vite-tsconfig-paths"), COMMON)
.addDevDependency(packageName("vitest"), COMMON)
.addDevDependency(packageName("vitest-sonar-reporter"), COMMON)
.addDependency(packageName("react"), REACT)
.addDependency(packageName("react-dom"), REACT)
.addDevDependency(packageName("npm-run-all2"), COMMON)
.addScript(scriptKey("dev"), scriptCommand("npm-run-all dev:*"))
.addScript(scriptKey("dev:vite"), scriptCommand("vite"))
.addScript(scriptKey("build"), scriptCommand("npm-run-all build:*"))
.addScript(scriptKey("build:tsc"), scriptCommand("tsc"))
.addScript(scriptKey("build:vite"), scriptCommand("vite build --emptyOutDir"))
.addScript(scriptKey("preview"), scriptCommand("vite preview"))
.addScript(scriptKey("start"), scriptCommand("vite"))
.addScript(scriptKey("lint"), scriptCommand("eslint ."))
.addScript(scriptKey("watch"), scriptCommand("npm-run-all --parallel watch:*"))
.addScript(scriptKey("watch:tsc"), scriptCommand("tsc --noEmit --watch"))
.addScript(scriptKey("test"), scriptCommand("npm run watch:test"))
.addScript(scriptKey("test:coverage"), scriptCommand("vitest run --coverage"))
.addScript(scriptKey("watch:test"), scriptCommand("vitest --"))
.and()
.files()
.batch(SOURCE, to("."))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,43 +21,27 @@ void shouldBuildModuleWithStyle() {

assertThatModuleWithFiles(module, packageJsonFile(), lintStagedConfigFile(), eslintConfigFile(), tsConfigFile(), vitestConfigFile())
.hasFile("package.json")
.containing("\"type\": \"module\"")
.notContaining(nodeDependency("@tsconfig/recommended"))
.containing(nodeDependency("@testing-library/dom"))
.containing(nodeDependency("@testing-library/react"))
.containing(nodeDependency("@types/node"))
.containing(nodeDependency("@types/react"))
.containing(nodeDependency("@types/react-dom"))
.containing(nodeDependency("@tsconfig/vite-react"))
.containing(nodeDependency("@typescript-eslint/eslint-plugin"))
.containing(nodeDependency("@vitejs/plugin-react"))
.containing(nodeDependency("@vitest/coverage-istanbul"))
.containing(nodeDependency("typescript-eslint"))
.containing(nodeDependency("globals"))
.containing(nodeDependency("eslint"))
.containing(nodeDependency("eslint-plugin-react"))
.containing(nodeDependency("jsdom"))
.containing(nodeDependency("typescript"))
.containing(nodeDependency("ts-node"))
.containing(nodeDependency("vite"))
.containing(nodeDependency("vite-tsconfig-paths"))
.containing(nodeDependency("vitest"))
.containing(nodeDependency("vitest-sonar-reporter"))
.containing(nodeDependency("react"))
.containing(nodeDependency("npm-run-all2"))
.containing(nodeDependency("react-dom"))
.containing(nodeScript("dev", "npm-run-all dev:*"))
.containing(nodeScript("dev:vite", "vite"))
.containing(nodeScript("build", "npm-run-all build:*"))
.containing(nodeScript("build:tsc", "tsc"))
.containing(nodeScript("build:vite", "vite build --emptyOutDir"))
.containing(nodeScript("watch", "npm-run-all --parallel watch:*"))
.containing(nodeScript("watch:tsc", "tsc --noEmit --watch"))
.containing(nodeScript("preview", "vite preview"))
.containing(nodeScript("start", "vite"))
.containing(nodeScript("lint", "eslint ."))
.containing(nodeScript("test", "npm run watch:test"))
.containing(nodeScript("test:coverage", "vitest run --coverage"))
.containing(nodeScript("watch:test", "vitest --"))
.and()
.hasFile(".lintstagedrc.cjs")
.containing(
Expand Down

0 comments on commit 53623a3

Please sign in to comment.