Skip to content

Commit

Permalink
Fix merging issue
Browse files Browse the repository at this point in the history
  • Loading branch information
cregourd committed Nov 8, 2024
1 parent e9094a5 commit 01f03b0
Show file tree
Hide file tree
Showing 4 changed files with 1,282 additions and 235 deletions.
1 change: 0 additions & 1 deletion apps/example/app/[locale]/admin/[[...nextadmin]]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import Dashboard from "@/components/Dashboard";
import { options } from "@/options";
import { prisma } from "@/prisma";
import schema from "@/prisma/json-schema/json-schema.json";
import { NextAdmin, PromisePageProps } from "@premieroctet/next-admin";
import { getNextAdminProps } from "@premieroctet/next-admin/appRouter";
import { Metadata, Viewport } from "next";
Expand Down
1 change: 0 additions & 1 deletion apps/example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"@types/react-datepicker": "^4.19.3",
"@types/react-dom": "^18.2.0",
"autoprefixer": "^10.4.14",
"babel-plugin-superjson-next": "^0.4.5",
"eslint": "7.32.0",
"eslint-config-custom": "workspace:*",
"postcss": "^8.4.24",
Expand Down
13 changes: 7 additions & 6 deletions packages/eslint-config-custom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
"main": "index.js",
"license": "MIT",
"dependencies": {
"eslint": "^7.23.0",
"eslint-config-next": "13.0.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-turbo": "latest",
"eslint-plugin-react": "7.31.8"
"eslint": "^9.14.0",
"eslint-config-next": "15.0.3",
"eslint-config-prettier": "^9.1.0",
"eslint-config-turbo": "2.2.3",
"eslint-plugin-react": "7.37.2"
},
"devDependencies": {
"typescript": "^4.7.4"
"typescript": "^4.7.4",
"@typescript-eslint/parser": "^8.13.0"
},
"publishConfig": {
"access": "public"
Expand Down
Loading

0 comments on commit 01f03b0

Please sign in to comment.