Skip to content

Commit

Permalink
chore: add sorting json prettier
Browse files Browse the repository at this point in the history
Signed-off-by: Vu Nguyen <[email protected]>
  • Loading branch information
vujita committed Jan 7, 2024
1 parent 0019906 commit 3f9cec1
Show file tree
Hide file tree
Showing 16 changed files with 221 additions and 112 deletions.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ body:
attributes:
label: Additional information
description: Add any other information related to the feature here. If your feature request is related to any issues or discussions, link them here.

1 change: 1 addition & 0 deletions .husky/pre-push
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@

pnpm manypkg check
pnpm turbo run build lint type-check test e2e
pnpm run check
1 change: 1 addition & 0 deletions .lintstagedrc.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export default {
"pnpm-workspace.yaml": ["prettier --write", "git add"],
"*.{css}": ["prettier --write", "git add"],
"*.{mjs,json}": ["prettier --write", "git add"],
"*.{html}": ["prettier --write", "git add"],
"*.{js,jsx,ts,tsx,cjs,mjs,md}": ["prettier --write --list-different", "git add"],
"{apps,packages}/**/*.{js,jsx,ts,tsx,cjs,mjs,md}": ["prettier --write --list-different", "eslint --fix", "git add"],
};
11 changes: 11 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
*.md
packages/vujita-ui/*.js
packages/vujita-ui/*.d.ts
packages/vujita-ui/*.ts
packages/vujita-ui/*.mts
packages/vujita-ui/*.d.mts
packages/vujita-ui/*.mjs
test-results/
playwright-report/
playwright/.cache/
pnpm-lock.yaml
16 changes: 13 additions & 3 deletions apps/perf-extension/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,22 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link
rel="icon"
type="image/svg+xml"
href="/vite.svg"
/>
<meta
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>Vite + React + TS</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
<script
type="module"
src="/src/main.tsx"
></script>
</body>
</html>
4 changes: 2 additions & 2 deletions apps/perf-extension/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "perf-extension",
"private": true,
"version": "0.0.0",
"private": true,
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"dev": "vite",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview"
},
Expand Down
20 changes: 10 additions & 10 deletions apps/vubnguyen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,22 @@
"build": "rm -rf .next && pnpm with-env next build",
"clean": "git clean -xdf .next .turbo node_modules",
"dev": "pnpm with-env next dev",
"dev:preview": "pnpm with-env next start",
"e2e": "pnpm with-env playwright test",
"lint": "dotenv -v SKIP_ENV_VALIDATION=1 next lint",
"lint:fix": "pnpm lint -- --fix",
"dev:preview": "pnpm with-env next start",
"start": "pnpm with-env next start",
"type-check": "tsc --noEmit",
"e2e": "pnpm with-env playwright test",
"with-env": "dotenv -e ../../.env --"
},
"eslintConfig": {
"extends": [
"eslint-config-vujita/base",
"eslint-config-vujita/nextjs",
"eslint-config-vujita/react"
],
"root": true
},
"dependencies": {
"@fortawesome/free-solid-svg-icons": "6.4.2",
"@fortawesome/react-fontawesome": "0.2.0",
Expand Down Expand Up @@ -51,13 +59,5 @@
"postcss": "8.4.31",
"tailwindcss": "3.3.2",
"typescript": "5.1.6"
},
"eslintConfig": {
"root": true,
"extends": [
"eslint-config-vujita/base",
"eslint-config-vujita/nextjs",
"eslint-config-vujita/react"
]
}
}
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
"scripts": {
"build": "turbo build",
"build:storybook": "turbo build:storybook",
"check": "prettier --check \"**/*.{js,cjs,mjs,ts,tsx,md,json}\" --ignore-path .gitignore --ignore-path .eslintignore",
"check": "prettier --check \"**/*.{js,cjs,mjs,ts,tsx,md,json,html}\"",
"clean": "git clean -xdf node_modules",
"clean:workspaces": "pnpx turbo clean",
"db:generate": "turbo db:generate",
"db:migrate": "turbo db:migrate",
"db:push": "turbo db:push",
"db:studio": "pnpm -F db dev",
"dev": "turbo dev --parallel",
"dev:preview": "turbo dev:preview",
"dev:db": "turbo dev --filter db",
"dev:extension": "turbo dev --filter perf-extension",
"dev:preview": "turbo dev:preview",
"dev:storybook": "turbo dev:storybook --parallel",
"dev:vubnguyen": "turbo dev --filter vubnguyen --filter vujita-ui",
"format": "prettier --write \"**/*.{css,js,cjs,mjs,ts,tsx,md,json}\" --ignore-path .gitignore --ignore-path .eslintignore",
"format": "prettier --write \"**/*.{css,js,cjs,mjs,ts,tsx,md,json,html}\"",
"lint": "turbo lint && manypkg check",
"lint:fix": "turbo lint:fix && manypkg fix",
"manypkg:check": "manypkg check",
Expand All @@ -40,6 +40,7 @@
"lerna": "7.1.5",
"lint-staged": "13.2.3",
"prettier": "3.0.0",
"prettier-plugin-packagejson": "2.4.9",
"prettier-plugin-sort-json": "3.0.1",
"prettier-plugin-tailwindcss": "0.4.1",
"turbo": "1.10.14",
Expand Down
16 changes: 8 additions & 8 deletions packages/api/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
{
"name": "@vujita/api",
"private": true,
"version": "0.0.3-alpha.0",
"private": true,
"license": "MIT",
"main": "./index.ts",
"types": "./index.ts",
"license": "MIT",
"scripts": {
"clean": "rimraf .turbo node_modules",
"lint": "eslint .",
"lint:fix": "pnpm lint --fix",
"type-check": "tsc --noEmit"
},
"eslintConfig": {
"extends": [
"eslint-config-vujita/base"
],
"root": true
},
"dependencies": {
"@trpc/client": "10.34.0",
"@trpc/server": "10.34.0",
Expand All @@ -25,11 +31,5 @@
"eslint-config-vujita": "0.0.6-alpha.7",
"rimraf": "5.0.1",
"typescript": "5.1.6"
},
"eslintConfig": {
"root": true,
"extends": [
"eslint-config-vujita/base"
]
}
}
16 changes: 8 additions & 8 deletions packages/auth/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
{
"name": "@vujita/auth",
"private": true,
"version": "0.0.3-alpha.0",
"private": true,
"license": "MIT",
"main": "./index.ts",
"types": "./index.ts",
"license": "MIT",
"scripts": {
"clean": "rimraf .turbo node_modules",
"lint": "eslint .",
"lint:fix": "pnpm lint --fix",
"type-check": "tsc --noEmit"
},
"eslintConfig": {
"extends": [
"eslint-config-vujita/base"
],
"root": true
},
"dependencies": {
"@auth/drizzle-adapter": "0.3.13",
"@t3-oss/env-nextjs": "0.6.0",
Expand All @@ -26,11 +32,5 @@
"eslint-config-vujita": "0.0.6-alpha.7",
"rimraf": "5.0.1",
"typescript": "5.1.6"
},
"eslintConfig": {
"root": true,
"extends": [
"eslint-config-vujita/base"
]
}
}
8 changes: 4 additions & 4 deletions packages/config/eslint/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "eslint-config-vujita",
"version": "0.0.6-alpha.7",
"license": "MIT",
"homepage": "https://github.com/vujita/vubnguyen#readme",
"bugs": {
"url": "https://github.com/vujita/vubnguyen/issues"
Expand All @@ -10,9 +9,7 @@
"type": "git",
"url": "https://github.com/vujita/vubnguyen"
},
"publishConfig": {
"access": "public"
},
"license": "MIT",
"files": [
"./base.js",
"./nextjs.js",
Expand All @@ -36,5 +33,8 @@
"eslint": "8.45.0",
"eslint-plugin-react-refresh": "0.4.3",
"typescript": "5.1.6"
},
"publishConfig": {
"access": "public"
}
}
6 changes: 3 additions & 3 deletions packages/db/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@vujita/db",
"private": true,
"version": "0.0.3-alpha.0",
"private": true,
"license": "MIT",
"main": "./src/index.ts",
"types": "./src/index.ts",
"license": "MIT",
"scripts": {
"clean": "rm -rf .turbo node_modules",
"db:drop": "pnpm with-env drizzle-kit drop",
"db:generate": "pnpm with-env drizzle-kit generate:pg",
"db:migrate": "pnpm with-env tsx src/migrate.ts",
"db:push": "pnpm with-env drizzle-kit push:pg",
"db:generate": "pnpm with-env drizzle-kit generate:pg",
"dev": "pnpm with-env drizzle-kit studio --port 5556",
"with-env": "dotenv -e ../../.env --"
},
Expand Down
92 changes: 46 additions & 46 deletions packages/vujita-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,48 +1,71 @@
{
"name": "vujita-ui",
"version": "0.0.6-alpha.7",
"license": "MIT",
"homepage": "https://github.com/vujita/vubnguyen#readme",
"main": "index.js",
"module": "index.mjs",
"types": "index.d.ts",
"bugs": {
"url": "https://github.com/vujita/vubnguyen/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/vujita/vubnguyen"
},
"publishConfig": {
"access": "public"
},
"license": "MIT",
"main": "index.js",
"module": "index.mjs",
"types": "index.d.ts",
"files": [
"postcss.config.cjs",
"tailwind.config.ts",
"*.mjs",
"*.js"
],
"scripts": {
"build:clean": "rimraf ./*.mjs ./*.js ./*.mts ./*.d.ts ./*.map storybook-static",
"build:tsup": "tsup",
"build": "xrun -s build:clean build:tsup",
"build-storybook": "storybook build",
"build:clean": "rimraf ./*.mjs ./*.js ./*.mts ./*.d.ts ./*.map storybook-static",
"build:storybook": "pnpm storybook build",
"build:tsup": "tsup",
"clean": "rimraf .turbo node_modules",
"dev": "xrun dev:tsup",
"dev:storybook": "storybook dev -p 6006",
"dev:tsup": "tsup --watch",
"clean": "rimraf .turbo node_modules",
"lint": "eslint .",
"lint:fix": "pnpm lint --fix",
"prepare": "xrun build:tsup",
"type-check": "tsc --noEmit",
"test": "jest",
"with-env": "dotenv -e ../../.env --",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build"
"test": "jest",
"type-check": "tsc --noEmit",
"with-env": "dotenv -e ../../.env --"
},
"peerDependencies": {
"react": "*",
"react-dom": "*"
"eslintConfig": {
"extends": [
"eslint-config-vujita/base",
"eslint-config-vujita/react",
"plugin:storybook/recommended"
],
"overrides": [
{
"files": [
"*.test.js",
"*.test.jsx",
"*.test.ts",
"*.test.tsx"
],
"rules": {
"@typescript-eslint/no-unsafe-call": 1
}
},
{
"files": [
"*.stories.ts",
"*.stories.tsx"
],
"rules": {
"@typescript-eslint/await-thenable": "off"
}
}
],
"root": true
},
"dependencies": {
"class-variance-authority": "0.7.0",
Expand Down Expand Up @@ -83,34 +106,11 @@
"tsup": "7.2.0",
"typescript": "5.1.6"
},
"eslintConfig": {
"root": true,
"extends": [
"eslint-config-vujita/base",
"eslint-config-vujita/react",
"plugin:storybook/recommended"
],
"overrides": [
{
"files": [
"*.test.js",
"*.test.jsx",
"*.test.ts",
"*.test.tsx"
],
"rules": {
"@typescript-eslint/no-unsafe-call": 1
}
},
{
"files": [
"*.stories.ts",
"*.stories.tsx"
],
"rules": {
"@typescript-eslint/await-thenable": "off"
}
}
]
"peerDependencies": {
"react": "*",
"react-dom": "*"
},
"publishConfig": {
"access": "public"
}
}
Loading

0 comments on commit 3f9cec1

Please sign in to comment.