Skip to content

Commit

Permalink
Merge pull request #344 from cantte/dev
Browse files Browse the repository at this point in the history
new release
  • Loading branch information
CarlosPavajeau authored May 15, 2024
2 parents 4b598ec + 75ea2e4 commit 010fa37
Show file tree
Hide file tree
Showing 91 changed files with 10,249 additions and 5,779 deletions.
101 changes: 47 additions & 54 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,59 +1,52 @@
/** @type {import("eslint").Linter.Config} */
const config = {
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": true
},
"plugins": [
"@typescript-eslint",
"drizzle"
parser: "@typescript-eslint/parser",
parserOptions: {
project: true,
},
plugins: ["@typescript-eslint", "drizzle"],
extends: [
"next/core-web-vitals",
"plugin:@typescript-eslint/recommended-type-checked",
"plugin:@typescript-eslint/stylistic-type-checked",
],
rules: {
"@typescript-eslint/array-type": "off",
"@typescript-eslint/consistent-type-definitions": "off",
"@typescript-eslint/consistent-type-imports": [
"warn",
{
prefer: "type-imports",
fixStyle: "inline-type-imports",
},
],
"extends": [
"next/core-web-vitals",
"plugin:@typescript-eslint/recommended-type-checked",
"plugin:@typescript-eslint/stylistic-type-checked"
"@typescript-eslint/no-unused-vars": [
"warn",
{
argsIgnorePattern: "^_",
},
],
"rules": {
"@typescript-eslint/array-type": "off",
"@typescript-eslint/consistent-type-definitions": "off",
"@typescript-eslint/consistent-type-imports": [
"warn",
{
"prefer": "type-imports",
"fixStyle": "inline-type-imports"
}
],
"@typescript-eslint/no-unused-vars": [
"warn",
{
"argsIgnorePattern": "^_"
}
],
"@typescript-eslint/require-await": "off",
"@typescript-eslint/no-misused-promises": [
"error",
{
"checksVoidReturn": {
"attributes": false
}
}
],
"drizzle/enforce-delete-with-where": [
"error",
{
"drizzleObjectName": [
"db"
]
}
],
"drizzle/enforce-update-with-where": [
"error",
{
"drizzleObjectName": [
"db"
]
}
]
}
}
"@typescript-eslint/require-await": "off",
"@typescript-eslint/no-misused-promises": [
"error",
{
checksVoidReturn: {
attributes: false,
},
},
],
"drizzle/enforce-delete-with-where": [
"error",
{
drizzleObjectName: ["db"],
},
],
"drizzle/enforce-update-with-where": [
"error",
{
drizzleObjectName: ["db"],
},
],
},
};
module.exports = config;
14 changes: 14 additions & 0 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: "Setup and install"
description: "Common setup steps for Actions"

runs:
using: composite
steps:
- uses: pnpm/action-setup@v3
- uses: actions/setup-node@v4
with:
node-version: 20
cache: "pnpm"

- shell: bash
run: pnpm install
45 changes: 45 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: ci

on:
push:
branches:
- main
- dev
pull_request:
branches:
- main
- dev
release:
types: [released]

jobs:
avoid_redundancy:
runs-on: ubuntu-latest

steps:
- name: cancel previous redundant builds
uses: styfle/cancel-workflow-action@0.12.1
with:
access_token: ${{ github.token }}

lint:
runs-on: ubuntu-latest
name: Run ESLint
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: ./.github/actions/setup

- run: pnpm lint

prettier:
runs-on: ubuntu-latest
name: Run Prettier
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: ./.github/actions/setup

- run: pnpm format:check
6 changes: 0 additions & 6 deletions .idea/jsLinters/eslint.xml

This file was deleted.

1 change: 0 additions & 1 deletion .idea/prettier.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pnpm-lock.yaml
4 changes: 2 additions & 2 deletions drizzle.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { env } from "~/env";

export default {
schema: "./src/server/db/schema.ts",
driver: "pg",
dialect: "postgresql",
dbCredentials: {
connectionString: env.DATABASE_URL,
url: env.DATABASE_URL,
},
} satisfies Config;
69 changes: 37 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@
"db:push": "drizzle-kit push:pg",
"db:studio": "drizzle-kit studio",
"dev": "next dev",
"lint": "next lint",
"lint": "eslint . --ext .ts,.tsx,.js,.jsx",
"start": "next start",
"email": "dotenv \"email dev --dir src/emails --port 3500\""
"email": "dotenv \"email dev --dir src/emails --port 3500\"",
"format:check": "prettier --check .",
"format": "prettier --write ."
},
"dependencies": {
"@auth/drizzle-adapter": "^0.3.11",
"@auth/drizzle-adapter": "^1.1.0",
"@hookform/resolvers": "^3.3.4",
"@radix-ui/react-alert-dialog": "^1.0.5",
"@radix-ui/react-avatar": "^1.0.4",
Expand All @@ -28,55 +30,58 @@
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-toast": "^1.1.5",
"@radix-ui/react-tooltip": "^1.0.7",
"@react-email/components": "0.0.16",
"@t3-oss/env-nextjs": "^0.9.2",
"@tanstack/react-query": "^4.36.1",
"@tanstack/react-table": "^8.16.0",
"@trpc/client": "^10.45.2",
"@trpc/next": "^10.45.2",
"@trpc/react-query": "^10.45.2",
"@trpc/server": "^10.45.2",
"@react-email/components": "0.0.17",
"@t3-oss/env-nextjs": "^0.10.1",
"@tanstack/react-query": "^5.36.0",
"@tanstack/react-query-devtools": "^5.36.0",
"@tanstack/react-table": "^8.17.0",
"@trpc/client": "11.0.0-rc.366",
"@trpc/next": "11.0.0-rc.366",
"@trpc/react-query": "11.0.0-rc.366",
"@trpc/server": "11.0.0-rc.366",
"@uidotdev/usehooks": "^2.4.1",
"@upstash/ratelimit": "^1.1.3",
"@upstash/redis": "^1.30.1",
"@vercel/analytics": "^1.2.2",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.0",
"clsx": "^2.1.1",
"date-fns": "^3.6.0",
"drizzle-orm": "^0.30.8",
"framer-motion": "^11.1.7",
"drizzle-orm": "^0.30.10",
"framer-motion": "^11.1.9",
"jsbarcode": "^3.11.6",
"lucide-react": "^0.372.0",
"next": "^14.2.2",
"lucide-react": "^0.378.0",
"next": "^14.2.3",
"next-auth": "^4.24.7",
"next-themes": "^0.3.0",
"postgres": "^3.4.4",
"react": "18.2.0",
"react": "18.3.1",
"react-day-picker": "^8.10.1",
"react-dom": "18.2.0",
"react-email": "2.1.1",
"react-hook-form": "^7.51.3",
"react-dom": "18.3.1",
"react-email": "2.1.2",
"react-hook-form": "^7.51.4",
"resend": "^3.2.0",
"server-only": "^0.0.1",
"superjson": "^2.2.1",
"tailwind-merge": "^2.3.0",
"tailwindcss-animate": "^1.0.7",
"uuid": "^9.0.1",
"vaul": "^0.9.0",
"zod": "^3.22.5"
"vaul": "^0.9.1",
"zod": "^3.23.8"
},
"devDependencies": {
"@next/eslint-plugin-next": "^14.2.2",
"@next/eslint-plugin-next": "^14.2.3",
"@types/eslint": "^8.56.10",
"@types/node": "^20.12.7",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"@types/node": "^20.12.11",
"@types/react": "^18.3.2",
"@types/react-dom": "^18.3.0",
"@types/uuid": "^9.0.8",
"@typescript-eslint/eslint-plugin": "^7.7.0",
"@typescript-eslint/parser": "^7.7.0",
"@typescript-eslint/eslint-plugin": "^7.9.0",
"@typescript-eslint/parser": "^7.9.0",
"autoprefixer": "^10.4.19",
"dotenv-cli": "^7.4.1",
"drizzle-kit": "^0.20.17",
"dotenv-cli": "^7.4.2",
"drizzle-kit": "^0.21.1",
"eslint": "^8.57.0",
"eslint-config-next": "^14.2.2",
"eslint-config-next": "^14.2.3",
"eslint-plugin-drizzle": "^0.2.3",
"pg": "^8.11.5",
"postcss": "^8.4.38",
Expand All @@ -88,5 +93,5 @@
"ct3aMetadata": {
"initVersion": "7.24.2"
},
"packageManager": "pnpm@8.15.7"
"packageManager": "pnpm@9.1.1"
}
Loading

0 comments on commit 010fa37

Please sign in to comment.