update template-react-ts

mgcrea · Dec 11, 2023 · 96c44fd · 96c44fd
1 parent e6c2563
commit 96c44fd
Show file tree

Hide file tree

Showing 12 changed files with 178 additions and 286 deletions.
diff --git a/package.json b/package.json
@@ -29,9 +29,9 @@
     "setup": "scripts/runTemplates.sh 'pnpm install'",
     "postbuild": "shebang-trim dist/index.js dist/index.cjs",
     "prettify": "prettier --write src/ templates/",
-    "lint": "scripts/runTemplates.sh 'npm run lint'",
-    "prettycheck": "scripts/runTemplates.sh 'npm run prettycheck'",
-    "typecheck": "scripts/runTemplates.sh 'npm run typecheck'",
+    "lint": "scripts/runTemplates.sh 'npm run lint' --ignore astro",
+    "prettycheck": "scripts/runTemplates.sh 'npm run prettycheck' --ignore astro",
+    "typecheck": "scripts/runTemplates.sh 'npm run typecheck' --ignore astro",
     "test": "npm run lint && npm run prettycheck && npm run typecheck",
     "prepublishOnly": "npm run build"
   },

diff --git a/scripts/runTemplates.sh b/scripts/runTemplates.sh
@@ -16,10 +16,19 @@ do
   --eval)
     eval="$1"
     shift;;
+  --ignore)
+    ignore="$1"
+    shift;;
+  --bail)
+    bail=1
   esac
 done
 
-allTemplates=$(find templates -maxdepth 1 -mindepth 1 -type d | awk -F'/' 'NF!=1{print $2}' | sort -u)
+if [[ -z $ignore ]]; then
+  ignore="none"
+fi
+
+allTemplates=$(find templates -maxdepth 1 -mindepth 1 -type d -not -iname "template-${ignore}*" | awk -F'/' 'NF!=1{print $2}' | sort -u)
 
 for template in ${allTemplates[@]}; do
   cd templates/${template}

diff --git a/templates/template-react-ts/.eslintrc b/templates/template-react-ts/.eslintrc
diff --git a/templates/template-react-ts/.eslintrc.cjs b/templates/template-react-ts/.eslintrc.cjs
@@ -0,0 +1,5 @@
+/** @type {import("eslint").Linter.Config} */
+module.exports = {
+  extends: ["@mgcrea/react"],
+  root: true,
+};
diff --git a/templates/template-react-ts/.prettierrc b/templates/template-react-ts/.prettierrc
diff --git a/templates/template-react-ts/.prettierrc.mjs b/templates/template-react-ts/.prettierrc.mjs
@@ -0,0 +1,5 @@
+/** @type {import("prettier").Config} */
+export default {
+  printWidth: 111,
+  plugins: ["prettier-plugin-organize-imports"],
+};
diff --git a/templates/template-react-ts/index.html b/templates/template-react-ts/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />

diff --git a/templates/template-react-ts/package.json b/templates/template-react-ts/package.json
@@ -9,7 +9,7 @@
     "build": "tsc && vite build",
     "preview": "vite preview",
     "prettify": "prettier --write src/ test/",
-    "lint": "eslint src/ test/",
+    "lint": "eslint src/ test/ --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "prettycheck": "prettier --check src/ test/",
     "typecheck": "tsc --noEmit",
     "spec": "vitest --run",
@@ -21,22 +21,21 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@mgcrea/eslint-config-react": "^0.9.3",
+    "@mgcrea/eslint-config-react": "^0.9.4",
     "@testing-library/dom": "^9.3.3",
-    "@testing-library/jest-dom": "^6.1.5",
     "@testing-library/react": "^14.1.2",
     "@testing-library/user-event": "^14.5.1",
     "@tsconfig/vite-react": "^2.0.1",
     "@types/react": "^18.2.43",
     "@types/react-dom": "^18.2.17",
-    "@types/testing-library__jest-dom": "^5.14.9",
     "@vitejs/plugin-react-swc": "^3.5.0",
     "eslint": "^8.55.0",
     "happy-dom": "^12.10.3",
-    "prettier": "^3.1.0",
+    "prettier": "^3.1.1",
     "prettier-plugin-organize-imports": "^3.2.4",
     "typescript": "^5.3.3",
     "vite": "^5.0.7",
-    "vitest": "^1.0.3"
+    "vitest": "^1.0.4",
+    "vitest-dom": "^0.1.1"
   }
 }