Merge branch 'main' into chore/update-builsd

.gitignore

@@ -48,4 +48,6 @@ next-env.d.ts
 .env.sentry-build-plugin
 
 # for packages/lib
-generated/
+generated/
+.eslintcache
+.prettiercache

apps/beets-frontend-v3/.lintstagedrc.mjs

@@ -1,13 +1,7 @@
-// https://nextjs.org/docs/pages/building-your-application/configuring/eslint#lint-staged
-import baseConfig from '../../.lintstagedrc.cjs'
-import path from 'path'
-
-const buildEslintCommand = filenames =>
-  `next lint --fix --max-warnings 0 --file ${filenames
-    .map(f => path.relative(process.cwd(), f))
-    .join(' --file ')}`
-
 export default {
-  ...baseConfig,
-  '*.{js,jsx,ts,tsx}': [buildEslintCommand, 'bash -c "pnpm run typecheck"'],
+  '*.{js,jsx,ts,tsx}': "eslint --fix --cache --max-warnings 0",
+  '**/*.ts?(x)': 'bash -c "pnpm typecheck"',
+  '*.{md,json,yaml,ts,tsx}': 'prettier --write',
+  '*.css': 'stylelint --fix',
 }
+

apps/beets-frontend-v3/package.json

@@ -8,12 +8,12 @@
     "dev": "concurrently \"pnpm --filter @repo/lib graphql:gen --watch\" \"next dev -p 3001\"",
     "dev:no-gen": "next dev -p 3001",
     "gen:wagmi": "pnpm wagmi generate",
-    "lint": "next lint",
-    "lint:fix": "next lint --fix",
-    "format": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --check --cache --cache-location='node_modules/.cache/.prettiercache' --log-level=warn",
-    "format:fix": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --write --cache --cache-location='node_modules/.cache/.prettiercache' --log-level=warn",
+    "lint": "eslint . --cache",
+    "lint:fix": "eslint . --fix --max-warnings 0  --cache",
+    "format": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --check --cache --log-level=warn",
+    "format:fix": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --write --cache --log-level=warn",
     "start": "next start",
-    "typecheck": "tsc --project tsconfig.json --noEmit",
+    "typecheck": "tsc --project tsconfig.json --noEmit --incremental",
     "gen:theme-typings": "chakra-cli tokens ./lib/services/chakra/themes/beets/beets.theme.ts",
     "postinstall": "npm run gen:theme-typings"
   },

apps/beets-frontend-v3/tsconfig.json

@@ -22,5 +22,5 @@
     ".next/types/**/*.ts",
     "../../packages/lib/global.d.ts"
   ],
-  "exclude": ["node_modules", ".next"]
+  "exclude": ["node_modules", ".next", "**/generated/**"]
 }

apps/frontend-v3/.lintstagedrc.mjs

@@ -1,13 +1,7 @@
-// https://nextjs.org/docs/pages/building-your-application/configuring/eslint#lint-staged
-import baseConfig from '../../.lintstagedrc.cjs'
-import path from 'path'
-
-const buildEslintCommand = filenames =>
-  `next lint --fix --max-warnings 0 --file ${filenames
-    .map(f => path.relative(process.cwd(), f))
-    .join(' --file ')}`
-
 export default {
-  ...baseConfig,
-  '*.{js,jsx,ts,tsx}': [buildEslintCommand, 'bash -c "pnpm run typecheck"'],
+  '*.{js,jsx,ts,tsx}': "eslint --fix --cache --max-warnings 0",
+  '**/*.ts?(x)': 'bash -c "pnpm typecheck"',
+  '*.{md,json,yaml,ts,tsx}': 'prettier --write',
+  '*.css': 'stylelint --fix',
 }
+

apps/frontend-v3/package.json

@@ -8,12 +8,12 @@
     "dev": "concurrently \"pnpm --filter @repo/lib graphql:gen --watch\" \"next dev\"",
     "dev:no-gen": "next dev",
     "gen:wagmi": "pnpm wagmi generate",
-    "lint": "next lint",
-    "lint:fix": "next lint --fix",
-    "format": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --check --cache --cache-location='node_modules/.cache/.prettiercache' --log-level warn",
-    "format:fix": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --write --cache --cache-location='node_modules/.cache/.prettiercache' --log-level=warn",
+    "lint": "eslint . --max-warnings 0 --cache",
+    "lint:fix": "eslint . --fix --max-warnings 0 --cache",
+    "format": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --check --cache --log-level warn",
+    "format:fix": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --write --cache --log-level=warn",
     "start": "next start",
-    "typecheck": "tsc --project tsconfig.json --noEmit",
+    "typecheck": "tsc --project tsconfig.json --noEmit --incremental",
     "gen:theme-typings": "chakra-cli tokens ./lib/services/chakra/themes/bal/bal.theme.ts",
     "postinstall": "npm run gen:theme-typings"
   },

apps/frontend-v3/tsconfig.json

@@ -22,5 +22,5 @@
     ".next/types/**/*.ts",
     "../../packages/lib/global.d.ts"
   ],
-  "exclude": ["node_modules", ".next"]
+  "exclude": ["node_modules", ".next", "**/generated/**"]
 }

package.json

@@ -12,8 +12,8 @@
     "lint:all:fix": "turbo run lint:fix format:fix --continue --force",
     "lint": "turbo lint",
     "lint:fix": "turbo lint:fix",
-    "format": "prettier '*.*(md|json|yaml|ts|js|tsx)' --check --cache --cache-location='node_modules/.cache/.prettiercache'",
-    "format:fix": "prettier '*.*(md|json|yaml|ts|js|tsx)' --write --cache --cache-location='node_modules/.cache/.prettiercache' --log-level=warn",
+    "format": "prettier '*.*(md|json|yaml|ts|js|tsx)' --check --cache",
+    "format:fix": "prettier '*.*(md|json|yaml|ts|js|tsx)' --write --cache --log-level=warn",
     "stylelint": "stylelint '**/*.css'",
     "stylelint:fix": "pnpm run stylelint -- --fix",
     "test:integration": "turbo test:integration --ui=stream --log-order=stream --",

packages/eslint-config/next.js

@@ -33,12 +33,22 @@ module.exports = {
     // Ignore dotfiles
     '.*.js',
     'node_modules/',
+    'next.config.js',
   ],
   overrides: [{ files: ['*.js?(x)', '*.ts?(x)'] }],
   rules: {
     curly: ['error', 'multi-line'],
     'no-console': ['off'],
-    'max-len': ['warn', { code: 120, ignoreComments: true, ignoreUrls: true, ignoreTemplateLiterals: true, ignoreStrings: true }],
+    'max-len': [
+      'warn',
+      {
+        code: 120,
+        ignoreComments: true,
+        ignoreUrls: true,
+        ignoreTemplateLiterals: true,
+        ignoreStrings: true,
+      },
+    ],
     '@typescript-eslint/no-explicit-any': ['off'],
     'no-html-link-for-pages': ['off'],
     'no-restricted-imports': [

packages/eslint-config/package.json

@@ -21,7 +21,7 @@
   "scripts": {
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "format": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --check --cache --cache-location='node_modules/.cache/.prettiercache' --log-level=warn",
-    "format:fix": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --write --cache --cache-location='node_modules/.cache/.prettiercache' --log-level=warn"
+    "format": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --check --cache --log-level=warn",
+    "format:fix": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --write --cache --log-level=warn"
   }
 }

packages/lib/.lintstagedrc.mjs

@@ -0,0 +1,7 @@
+export default {
+  '*.{js,jsx,ts,tsx}': "eslint --fix --cache --max-warnings 0",
+  '**/*.ts?(x)': 'bash -c "pnpm typecheck"',
+  '*.{md,json,yaml,ts,tsx}': 'prettier --write',
+  '*.css': 'stylelint --fix',
+}
+

packages/lib/package.json

@@ -4,16 +4,16 @@
   "private": true,
   "scripts": {
     "graphql:gen": "DOTENV_CONFIG_PATH=./.env.local graphql-codegen -r dotenv/config -c ./shared/services/api/codegen.ts",
-    "lint": "eslint . --cache --cache-location 'node_modules/.cache/.eslintcache'",
-    "lint:fix": "eslint . --fix --cache --cache-location 'node_modules/.cache/.eslintcache'",
-    "format": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --check --cache --cache-location='node_modules/.cache/.prettiercache' --log-level=warn",
-    "format:fix": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --write --cache --cache-location='node_modules/.cache/.prettiercache' --log-level=warn",
+    "lint": "eslint . --cache",
+    "lint:fix": "eslint . --fix --max-warnings 0  --cache",
+    "format": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --check --cache --log-level=warn",
+    "format:fix": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --write --cache --log-level=warn",
     "test": "pnpm test:unit & pnpm run test:integration",
     "test:integration": "vitest -c ./vitest.config.integration.ts",
     "test:unit": "vitest",
     "test:unit:coverage": "vitest --coverage",
     "test:unit:silent:coverage": "SILENT_TESTS=true vitest --coverage",
-    "typecheck": "tsc --project tsconfig.json --noEmit"
+    "typecheck": "tsc --project tsconfig.json --noEmit --incremental"
   },
   "dependencies": {
     "@apollo/client": "^3.11.8",

packages/lib/tsconfig.json

@@ -10,5 +10,5 @@
     "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
   },
   "include": ["**/*.ts", "**/*.tsx", "global.d.ts"],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules", "**/generated/**"]
 }

packages/prettier-config/package.json

@@ -10,7 +10,7 @@
   "scripts": {
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "format": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --check --cache --cache-location='node_modules/.cache/.prettiercache' --log-level=warn",
-    "format:fix": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --write --cache --cache-location='node_modules/.cache/.prettiercache' --log-level=warn"
+    "format": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --check --cache --log-level=warn",
+    "format:fix": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --write --cache --log-level=warn"
   }
 }

packages/typescript-config/package.json

@@ -7,7 +7,7 @@
     "access": "public"
   },
   "scripts": {
-    "format": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --check --cache --cache-location='node_modules/.cache/.prettiercache' --log-level=warn",
-    "format:fix": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --write --cache --cache-location='node_modules/.cache/.prettiercache' --log-level=warn"
+    "format": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --check --cache --log-level=warn",
+    "format:fix": "prettier '**/*.*(md|json|yaml|ts|js|tsx)' --write --cache --log-level=warn"
   }
 }

turbo.json

@@ -13,7 +13,8 @@
     "VITEST_POOL_ID",
     "NODE_ENV",
     "SILENT_TESTS",
-    "NEXT_PUBLIC_SENTRY_DSN"
+    "NEXT_PUBLIC_SENTRY_DSN",
+    "NEXT_RUNTIME"
   ],
   "tasks": {
     "dev": {