Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions apps/expo/app.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { ConfigContext, ExpoConfig } from "expo/config";
import type { ConfigContext } from "expo/config";

export default ({ config }: ConfigContext): ExpoConfig => ({
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default ({ config }: ConfigContext): any => ({
...config,
name: "billion",
slug: "billion",
Expand Down
10 changes: 4 additions & 6 deletions apps/expo/src/app/(tabs)/feed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,11 @@ export default function FeedScreen() {
isFetchingNextPage,
status,
error,
} = useInfiniteQuery({
...trpc.video.getInfinite.infiniteQueryOptions({
limit: 10,
} = useInfiniteQuery(
trpc.video.getInfinite.infiniteQueryOptions({ limit: 10 }, {
getNextPageParam: (lastPage) => lastPage.nextCursor,
}),
initialPageParam: 0,
getNextPageParam: (lastPage) => lastPage.nextCursor,
});
);

// Flatten all pages into a single array of videos

Expand Down
1 change: 0 additions & 1 deletion packages/db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"with-env": "dotenv -e ../../.env --"
},
"dependencies": {
"@vercel/postgres": "^0.10.0",
"drizzle-orm": "^0.45.2",
"drizzle-zod": "^0.8.3",
"pg": "^8.20.0",
Expand Down
851 changes: 507 additions & 344 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ catalog:
eslint: ^10.1.0
prettier: ^3.8.1
tailwindcss: ^4.2.2
typescript: 6.0.2
typescript: 5.9.2
zod: 4.3.6

catalogs:
Expand All @@ -33,6 +33,12 @@ linkWorkspacePackages: true
onlyBuiltDependencies:
- esbuild

peerDependencyRules:
allowedVersions:
# These plugins work with ESLint 10 but haven't updated their peer dep declarations yet
eslint-plugin-jsx-a11y>eslint: '10'
eslint-plugin-react>eslint: '10'

overrides:
'@types/minimatch': 5.1.2
esbuild@<=0.24.2: '>=0.25.0'
Expand Down
6 changes: 3 additions & 3 deletions tooling/eslint/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import * as path from "node:path";
import { includeIgnoreFile } from "@eslint/compat";
import eslint from "@eslint/js";
import importPlugin from "eslint-plugin-import";
import importPlugin from "eslint-plugin-import-x";
import turboPlugin from "eslint-plugin-turbo";
import { defineConfig } from "eslint/config";
import tseslint from "typescript-eslint";
Expand Down Expand Up @@ -45,7 +45,7 @@ export const baseConfig = defineConfig(
{
files: ["**/*.js", "**/*.ts", "**/*.tsx"],
plugins: {
import: importPlugin,
"import-x": importPlugin,
turbo: turboPlugin,
},
extends: [
Expand Down Expand Up @@ -75,7 +75,7 @@ export const baseConfig = defineConfig(
},
],
"@typescript-eslint/no-non-null-assertion": "error",
"import/consistent-type-specifier-style": ["error", "prefer-top-level"],
"import-x/consistent-type-specifier-style": ["error", "prefer-top-level"],
},
},
{
Expand Down
4 changes: 2 additions & 2 deletions tooling/eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"@eslint/compat": "^2.0.3",
"@eslint/js": "catalog:",
"@next/eslint-plugin-next": "^16.2.1",
"eslint-plugin-import": "^2.32.0",
"eslint-plugin-import-x": "^4.16.2",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^7.0.1",
"eslint-plugin-react-hooks": "7.1.0-canary-9627b5a1-20260327",
"eslint-plugin-turbo": "^2.8.21",
"typescript-eslint": "^8.57.2"
},
Expand Down
9 changes: 0 additions & 9 deletions tooling/eslint/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,6 @@
* we "need" to type some of the plugins manually :(
*/

declare module "eslint-plugin-import" {
import type { Linter, Rule } from "eslint";

export const configs: {
recommended: { rules: Linter.RulesRecord };
};
export const rules: Record<string, Rule.RuleModule>;
}

// declare module "eslint-plugin-react" {
// import type { Linter, Rule } from "eslint";

Expand Down
Loading