Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add import order sorting via prettier #1392

Merged
merged 26 commits into from
May 17, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
removed eslint from base project
  • Loading branch information
FinnDore committed May 9, 2023
commit 4ee772f18d55e0cd777e3f965295c0aee3090d11
12 changes: 8 additions & 4 deletions cli/src/installers/dependencyVersionMap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ export const dependencyVersionMap = {
tailwindcss: "^3.3.0",
autoprefixer: "^10.4.14",
postcss: "^8.4.21",
prettier: "^2.8.6",
"prettier-plugin-tailwindcss": "^0.2.6",
"@types/prettier": "^2.7.2",

// tRPC
"@trpc/client": "^10.18.0",
Expand All @@ -27,7 +24,14 @@ export const dependencyVersionMap = {
"@tanstack/react-query": "^4.28.0",
superjson: "1.12.2",

// strictEslintAndPrettier
// Prettier
prettier: "^2.8.6",
"prettier-plugin-tailwindcss": "^0.2.6",
"@types/prettier": "^2.7.2",
"@ianvs/prettier-plugin-sort-imports": "^3.7.2",

// Eslint
eslint: "^8.36.0",
"eslint-config-next": "^13.4.1",
} as const;
export type AvailableDependencies = keyof typeof dependencyVersionMap;
13 changes: 9 additions & 4 deletions cli/src/installers/eslint.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
import fs from "fs-extra";
import path from "path";
import { PKG_ROOT } from "~/consts.js";
import { addPackageDependency } from "~/utils/addPackageDependency.js";
import { type Installer } from "./index.js";

export const eslint: Installer = ({ projectDir, packages }) => {
export const eslint: Installer = ({ projectDir }) => {
const configDir = path.join(PKG_ROOT, "template/extras/config");

fs.rmSync(path.join(projectDir, "_eslintrc.cjs"));
addPackageDependency({
dependencies: ["eslint", "eslint-config-next"],
devMode: true,
projectDir,
});

fs.copySync(
path.join(configDir, "_prettier.config.cjs"),
path.join(projectDir, "prettier.config.cjs"),
path.join(configDir, "_eslintrc.cjs"),
path.join(projectDir, "eslintrc.cjs"),
);
};
Loading