Merge remote-tracking branch 'origin/dev' into feat/app-tour
# Conflicts: # apps/nextjs/src/app/[locale]/_client-providers/mantine.tsx # apps/nextjs/src/app/[locale]/boards/(content)/_client.tsx # apps/nextjs/src/app/[locale]/boards/(content)/_header-actions.tsx # apps/nextjs/src/app/[locale]/manage/apps/page.tsx # apps/nextjs/src/app/[locale]/manage/boards/page.tsx # apps/nextjs/src/app/[locale]/manage/integrations/page.tsx # apps/nextjs/src/app/[locale]/manage/users/_components/user-list.tsx # apps/nextjs/src/components/layout/navigation-link.tsx # packages/ui/src/theme.ts # pnpm-lock.yaml # pnpm-workspace.yaml
This commit is contained in:
273 files changed
+3327
-5147
No files matched your search
@@ -7,13 +7,12 @@
|
||||
"build": "pnpm with-env next build",
|
||||
"clean": "git clean -xdf .next .turbo node_modules",
|
||||
"dev": "pnpm with-env next dev",
|
||||
"format": "prettier --check . --ignore-path ../../.gitignore",
|
||||
"lint": "eslint",
|
||||
"format": "oxfmt .",
|
||||
"lint": "oxlint",
|
||||
"start": "pnpm with-env next start",
|
||||
"typecheck": "tsc --noEmit",
|
||||
"with-env": "dotenv -e ../../.env --"
|
||||
},
|
||||
"prettier": "@homarr/prettier-config",
|
||||
"dependencies": {
|
||||
"@dnd-kit/core": "catalog:",
|
||||
"@dnd-kit/modifiers": "catalog:",
|
||||
@@ -93,8 +92,6 @@
|
||||
"zod": "catalog:"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@homarr/eslint-config": "workspace:^0.2.0",
|
||||
"@homarr/prettier-config": "workspace:^0.1.0",
|
||||
"@homarr/tsconfig": "workspace:^0.1.0",
|
||||
"@types/chroma-js": "catalog:",
|
||||
"@types/node": "catalog:",
|
||||
@@ -103,9 +100,7 @@
|
||||
"@types/react-dom": "catalog:",
|
||||
"@types/swagger-ui-react": "catalog:",
|
||||
"concurrently": "catalog:",
|
||||
"eslint": "catalog:",
|
||||
"node-loader": "catalog:",
|
||||
"prettier": "catalog:",
|
||||
"typescript": "catalog:"
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user