mirror of
https://github.com/umami-software/umami.git
synced 2026-02-24 06:25:43 +01:00
Merge branch 'dev' into analytics
This commit is contained in:
commit
64d4418d94
6 changed files with 29 additions and 34 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -18,7 +18,6 @@ node_modules
|
|||
/public/script.js
|
||||
/geo
|
||||
/dist
|
||||
src/generated/prisma/
|
||||
|
||||
# misc
|
||||
.DS_Store
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
generator client {
|
||||
provider = "prisma-client-js"
|
||||
output = "../src/generated/prisma"
|
||||
binaryTargets = ["native"]
|
||||
}
|
||||
|
||||
datasource db {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
generator client {
|
||||
provider = "prisma-client-js"
|
||||
output = "../src/generated/prisma"
|
||||
binaryTargets = ["native"]
|
||||
}
|
||||
|
||||
datasource db {
|
||||
|
|
|
|||
2
pnpm-lock.yaml
generated
2
pnpm-lock.yaml
generated
|
|
@ -391,7 +391,7 @@ importers:
|
|||
specifier: ^4.3.8
|
||||
version: 4.5.6(@types/react@19.1.2)(immer@9.0.21)(react@18.3.1)
|
||||
|
||||
src/generated/prisma: {}
|
||||
|
||||
|
||||
packages:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* eslint-disable no-console */
|
||||
require('dotenv').config();
|
||||
const { PrismaClient } = require('../src/generated/prisma/index.js');
|
||||
const { PrismaClient } = require('@prisma/client');
|
||||
const chalk = require('chalk');
|
||||
const { execSync } = require('child_process');
|
||||
const semver = require('semver');
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import debug from 'debug';
|
||||
import { PrismaClient } from '@/generated/prisma/index.js';
|
||||
import { PrismaClient } from '@prisma/client';
|
||||
import { readReplicas } from '@prisma/extension-read-replicas';
|
||||
import { formatInTimeZone } from 'date-fns-tz';
|
||||
import { MYSQL, POSTGRESQL, getDatabaseType } from '@/lib/db';
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue