fixed biome scripts and created addPackageScript function

t3-oss · Nov 15, 2024 · cbad9bc · cbad9bc
1 parent 2c1f7f1
commit cbad9bc
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 58 deletions.
diff --git a/cli/src/installers/biome.ts b/cli/src/installers/biome.ts
@@ -1,10 +1,10 @@
 import path from "path";
 import fs from "fs-extra";
-import { type PackageJson } from "type-fest";
 
 import { PKG_ROOT } from "~/consts.js";
 import { type Installer } from "~/installers/index.js";
 import { addPackageDependency } from "~/utils/addPackageDependency.js";
+import { addPackageScript } from "~/utils/addPackageScript.js";
 
 export const biomeInstaller: Installer = ({ projectDir }) => {
   addPackageDependency({
@@ -19,16 +19,12 @@ export const biomeInstaller: Installer = ({ projectDir }) => {
 
   fs.copySync(biomeConfigSrc, biomeConfigDest);
 
-  // add format:* scripts to package.json
-  const packageJsonPath = path.join(projectDir, "package.json");
-  const packageJsonContent = fs.readJSONSync(packageJsonPath) as PackageJson;
-  packageJsonContent.scripts = {
-    ...packageJsonContent.scripts,
-    "format:write": 'biome format --write "**/*.{ts,tsx,js,jsx,mdx}"',
-    "format:check": 'biome format --check "**/*.{ts,tsx,js,jsx,mdx}"',
-  };
-
-  fs.writeJSONSync(packageJsonPath, packageJsonContent, {
-    spaces: 2,
+  addPackageScript({
+    projectDir,
+    scripts: {
+      "format:unsafe": "biome check --write --unsafe .",
+      "format:write": "biome check --write .",
+      "format:check": "biome check .",
+    },
   });
 };
diff --git a/cli/src/installers/drizzle.ts b/cli/src/installers/drizzle.ts
@@ -1,10 +1,10 @@
 import path from "path";
 import fs from "fs-extra";
-import { type PackageJson } from "type-fest";
 
 import { PKG_ROOT } from "~/consts.js";
 import { type Installer } from "~/installers/index.js";
 import { addPackageDependency } from "~/utils/addPackageDependency.js";
+import { addPackageScript } from "~/utils/addPackageScript.js";
 
 export const drizzleInstaller: Installer = ({
   projectDir,
@@ -69,24 +69,19 @@ export const drizzleInstaller: Installer = ({
   );
   const clientDest = path.join(projectDir, "src/server/db/index.ts");
 
-  // add db:* scripts to package.json
-  const packageJsonPath = path.join(projectDir, "package.json");
-
-  const packageJsonContent = fs.readJSONSync(packageJsonPath) as PackageJson;
-  packageJsonContent.scripts = {
-    ...packageJsonContent.scripts,
-    "db:push": "drizzle-kit push",
-    "db:studio": "drizzle-kit studio",
-    "db:generate": "drizzle-kit generate",
-    "db:migrate": "drizzle-kit migrate",
-  };
+  addPackageScript({
+    projectDir,
+    scripts: {
+      "db:push": "drizzle-kit push",
+      "db:studio": "drizzle-kit studio",
+      "db:generate": "drizzle-kit generate",
+      "db:migrate": "drizzle-kit migrate",
+    },
+  });
 
   fs.copySync(configFile, configDest);
   fs.mkdirSync(path.dirname(schemaDest), { recursive: true });
   fs.writeFileSync(schemaDest, schemaContent);
   fs.writeFileSync(configDest, configContent);
   fs.copySync(clientSrc, clientDest);
-  fs.writeJSONSync(packageJsonPath, packageJsonContent, {
-    spaces: 2,
-  });
 };
diff --git a/cli/src/installers/eslint.ts b/cli/src/installers/eslint.ts
@@ -1,11 +1,11 @@
 import path from "path";
 import fs from "fs-extra";
-import { type PackageJson } from "type-fest";
 
 import { _initialConfig } from "~/../template/extras/config/_eslint.js";
 import { PKG_ROOT } from "~/consts.js";
 import { type Installer } from "~/installers/index.js";
 import { addPackageDependency } from "~/utils/addPackageDependency.js";
+import { addPackageScript } from "~/utils/addPackageScript.js";
 import { type AvailableDependencies } from "./dependencyVersionMap.js";
 
 // Also installs prettier
@@ -44,17 +44,15 @@ export const dynamicEslintInstaller: Installer = ({ projectDir, packages }) => {
 
   fs.copySync(prettierSrc, prettierDest);
 
-  // add format:* scripts to package.json
-  const packageJsonPath = path.join(projectDir, "package.json");
-  const packageJsonContent = fs.readJSONSync(packageJsonPath) as PackageJson;
-  packageJsonContent.scripts = {
-    ...packageJsonContent.scripts,
-    "format:write": 'prettier --write "**/*.{ts,tsx,js,jsx,mdx}" --cache',
-    "format:check": 'prettier --check "**/*.{ts,tsx,js,jsx,mdx}" --cache',
-  };
-
-  fs.writeJSONSync(packageJsonPath, packageJsonContent, {
-    spaces: 2,
+  addPackageScript({
+    projectDir,
+    scripts: {
+      lint: "next lint",
+      "lint:fix": "next lint --fix",
+      check: "next lint && tsc --noEmit",
+      "format:write": 'prettier --write "**/*.{ts,tsx,js,jsx,mdx}" --cache',
+      "format:check": 'prettier --check "**/*.{ts,tsx,js,jsx,mdx}" --cache',
+    },
   });
 
   // eslint

diff --git a/cli/src/installers/prisma.ts b/cli/src/installers/prisma.ts
@@ -1,10 +1,10 @@
 import path from "path";
 import fs from "fs-extra";
-import { type PackageJson } from "type-fest";
 
 import { PKG_ROOT } from "~/consts.js";
 import { type Installer } from "~/installers/index.js";
 import { addPackageDependency } from "~/utils/addPackageDependency.js";
+import { addPackageScript } from "~/utils/addPackageScript.js";
 
 export const prismaInstaller: Installer = ({
   projectDir,
@@ -65,21 +65,16 @@ export const prismaInstaller: Installer = ({
   );
   const clientDest = path.join(projectDir, "src/server/db.ts");
 
-  // add postinstall and push script to package.json
-  const packageJsonPath = path.join(projectDir, "package.json");
-
-  const packageJsonContent = fs.readJSONSync(packageJsonPath) as PackageJson;
-  packageJsonContent.scripts = {
-    ...packageJsonContent.scripts,
-    postinstall: "prisma generate",
-    "db:push": "prisma db push",
-    "db:studio": "prisma studio",
-    "db:generate": "prisma migrate dev",
-    "db:migrate": "prisma migrate deploy",
-  };
+  addPackageScript({
+    projectDir,
+    scripts: {
+      postinstall: "prisma generate",
+      "db:push": "prisma db push",
+      "db:studio": "prisma studio",
+      "db:generate": "prisma migrate dev",
+      "db:migrate": "prisma migrate deploy",
+    },
+  });
 
   fs.copySync(clientSrc, clientDest);
-  fs.writeJSONSync(packageJsonPath, packageJsonContent, {
-    spaces: 2,
-  });
 };
diff --git a/cli/src/utils/addPackageScript.ts b/cli/src/utils/addPackageScript.ts
@@ -0,0 +1,25 @@
+import path from "path";
+import fs from "fs-extra";
+import sortPackageJson from "sort-package-json";
+import { type PackageJson } from "type-fest";
+
+export const addPackageScript = (opts: {
+  scripts: Record<string, string>;
+  projectDir: string;
+}) => {
+  const { scripts, projectDir } = opts;
+
+  const packageJsonPath = path.join(projectDir, "package.json");
+  const packageJsonContent = fs.readJSONSync(packageJsonPath) as PackageJson;
+
+  packageJsonContent.scripts = {
+    ...packageJsonContent.scripts,
+    ...scripts,
+  };
+
+  const sortedPkgJson = sortPackageJson(packageJsonContent);
+
+  fs.writeJSONSync(packageJsonPath, sortedPkgJson, {
+    spaces: 2,
+  });
+};
diff --git a/cli/template/base/package.json b/cli/template/base/package.json
@@ -7,9 +7,6 @@
     "dev": "next dev --turbo",
     "build": "next build",
     "start": "next start",
-    "lint": "next lint",
-    "lint:fix": "next lint --fix",
-    "check": "next lint && tsc --noEmit",
     "preview": "next build && next start",
     "typecheck": "tsc --noEmit"
   },