diff --git a/.eslintrc.json b/.eslintrc.json index 9d747b879..7f3665fff 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -22,20 +22,8 @@ "plugins": ["@typescript-eslint", "prettier"], "settings": { "import/resolver": { - "alias": { - "map": [ - ["assets", "./src/assets"], - ["components", "./src/components"], - ["db", "./db"], - ["hooks", "./src/components/hooks"], - ["lang", "./src/lang"], - ["lib", "./src/lib"], - ["public", "./public"], - ["queries", "./src/queries"], - ["store", "./src/store"], - ["styles", "./src/styles"] - ], - "extensions": [".ts", ".tsx", ".js", ".jsx", ".json"] + "node": { + "moduleDirectory": ["node_modules", "src/"] } } }, diff --git a/jsconfig.json b/jsconfig.json index 738e8a465..5875dc5b6 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { - "baseUrl": "./src" - } + "baseUrl": "src" + }, + "include": ["src"] } diff --git a/next.config.js b/next.config.js index a155ece75..e684ae976 100644 --- a/next.config.js +++ b/next.config.js @@ -8,7 +8,7 @@ const contentSecurityPolicy = [ `img-src *`, `script-src 'self' 'unsafe-eval' 'unsafe-inline'`, `style-src 'self' 'unsafe-inline'`, - `connect-src 'self' api.umami.is`, + `connect-src 'self' api.umami.is cloud.umami.is`, `frame-ancestors 'self' ${process.env.ALLOWED_FRAME_URLS || ''}`, ]; diff --git a/package.json b/package.json index 0f437c355..4d0cd78ca 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "dependencies": { "@clickhouse/client": "^0.2.2", "@fontsource/inter": "^4.5.15", - "@prisma/client": "5.6.0", + "@prisma/client": "5.7.0", "@prisma/extension-read-replicas": "^0.3.0", "@react-spring/web": "^9.7.3", "@tanstack/react-query": "^5.12.2", @@ -97,7 +97,7 @@ "next-basics": "^0.39.0", "node-fetch": "^3.2.8", "npm-run-all": "^4.1.5", - "prisma": "5.6.0", + "prisma": "5.7.0", "react": "^18.2.0", "react-basics": "^0.114.0", "react-beautiful-dnd": "^13.1.0", @@ -135,7 +135,7 @@ "cross-env": "^7.0.3", "esbuild": "^0.17.17", "eslint": "^8.33.0", - "eslint-config-next": "^12.2.4", + "eslint-config-next": "^14.0.4", "eslint-config-prettier": "^8.5.0", "eslint-import-resolver-alias": "^1.1.2", "eslint-plugin-import": "^2.26.0", diff --git a/src/app/(main)/App.tsx b/src/app/(main)/App.tsx index 4b0931652..74be82922 100644 --- a/src/app/(main)/App.tsx +++ b/src/app/(main)/App.tsx @@ -27,7 +27,7 @@ export function App({ children }) { {children} {process.env.NODE_ENV === 'production' && !pathname.includes('/share/') && ( -