diff --git a/package.components.json b/package.components.json index c48784f2..ae9cbe75 100644 --- a/package.components.json +++ b/package.components.json @@ -1,6 +1,6 @@ { "name": "@umami/components", - "version": "0.100.0", + "version": "0.101.0", "description": "Umami React components.", "author": "Mike Cao ", "license": "MIT", @@ -13,7 +13,6 @@ "colord": "^2.9.2", "date-fns-tz": "^1.1.4", "immer": "^9.0.12", - "moment-timezone": "^0.5.35", "next": "^13.4.0", "next-basics": "^0.36.0", "react": "^18.2.0", diff --git a/scripts/check-db.js b/scripts/check-db.js index ef974e80..7c7daaa1 100644 --- a/scripts/check-db.js +++ b/scripts/check-db.js @@ -3,7 +3,7 @@ import 'dotenv/config'; import { execSync } from 'node:child_process'; import chalk from 'chalk'; import semver from 'semver'; -import { PrismaClient } from '../dist/generated/prisma/client.js'; +import { PrismaClient } from '../generated/prisma/client.js'; import { PrismaPg } from '@prisma/adapter-pg'; const MIN_VERSION = '9.4.0'; diff --git a/src/lib/auth.ts b/src/lib/auth.ts index 9535f750..1b8068e1 100644 --- a/src/lib/auth.ts +++ b/src/lib/auth.ts @@ -1,12 +1,12 @@ import bcrypt from 'bcryptjs'; -import redis from '@/lib/redis'; import debug from 'debug'; import { ROLE_PERMISSIONS, ROLES, SHARE_TOKEN_HEADER } from '@/lib/constants'; import { secret } from '@/lib/crypto'; import { getRandomChars } from '@/lib/generate'; import { createSecureToken, parseSecureToken, parseToken } from '@/lib/jwt'; import { ensureArray } from '@/lib/utils'; -import { getUser } from '@/queries'; +import redis from '@/lib/redis'; +import { getUser } from '@/queries/prisma/user'; const log = debug('umami:auth'); const SALT_ROUNDS = 10; diff --git a/tsconfig.prisma.json b/tsconfig.prisma.json index 25d5e43c..b8b0714b 100644 --- a/tsconfig.prisma.json +++ b/tsconfig.prisma.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "include": ["src/generated/prisma/client.ts"], "compilerOptions": { - "outDir": "dist/generated/prisma", + "outDir": "generated/prisma", "module": "ESNext", "moduleResolution": "Node", "target": "ES2020",