mirror of
https://github.com/umami-software/umami.git
synced 2025-12-06 01:18:00 +01:00
Use generated prisma client.
This commit is contained in:
parent
c0ccffeab4
commit
63e0873b5d
9 changed files with 1253 additions and 114 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -18,6 +18,7 @@ node_modules
|
||||||
/public/script.js
|
/public/script.js
|
||||||
/geo
|
/geo
|
||||||
/dist
|
/dist
|
||||||
|
src/generated/prisma/
|
||||||
|
|
||||||
# misc
|
# misc
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
generator client {
|
generator client {
|
||||||
provider = "prisma-client-js"
|
provider = "prisma-client"
|
||||||
|
output = "../src/generated/prisma"
|
||||||
}
|
}
|
||||||
|
|
||||||
datasource db {
|
datasource db {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
generator client {
|
generator client {
|
||||||
provider = "prisma-client-js"
|
provider = "prisma-client"
|
||||||
|
output = "../src/generated/prisma"
|
||||||
}
|
}
|
||||||
|
|
||||||
datasource db {
|
datasource db {
|
||||||
|
|
|
||||||
|
|
@ -22,11 +22,12 @@
|
||||||
"build-app": "next build",
|
"build-app": "next build",
|
||||||
"build-components": "rollup -c rollup.components.config.js",
|
"build-components": "rollup -c rollup.components.config.js",
|
||||||
"build-tracker": "rollup -c rollup.tracker.config.js",
|
"build-tracker": "rollup -c rollup.tracker.config.js",
|
||||||
"build-db": "npm-run-all copy-db-files build-db-client",
|
"build-db": "npm-run-all copy-db-files build-db-client build-prisma",
|
||||||
"build-lang": "npm-run-all format-lang compile-lang clean-lang download-country-names download-language-names",
|
"build-lang": "npm-run-all format-lang compile-lang clean-lang download-country-names download-language-names",
|
||||||
"build-geo": "node scripts/build-geo.js",
|
"build-geo": "node scripts/build-geo.js",
|
||||||
"build-db-schema": "prisma db pull",
|
"build-db-schema": "prisma db pull",
|
||||||
"build-db-client": "prisma generate",
|
"build-db-client": "prisma generate",
|
||||||
|
"build-prisma": "tsc --project tsconfig.prisma.json",
|
||||||
"build-icons": "svgr ./src/assets --out-dir ./src/components/svg --typescript",
|
"build-icons": "svgr ./src/assets --out-dir ./src/components/svg --typescript",
|
||||||
"set-routes-manifest": "node scripts/set-routes-manifest.js",
|
"set-routes-manifest": "node scripts/set-routes-manifest.js",
|
||||||
"update-tracker": "node scripts/update-tracker.js",
|
"update-tracker": "node scripts/update-tracker.js",
|
||||||
|
|
|
||||||
1329
pnpm-lock.yaml
generated
1329
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,10 +1,10 @@
|
||||||
/* eslint-disable no-console */
|
/* eslint-disable no-console */
|
||||||
import 'dotenv/config';
|
import 'dotenv/config';
|
||||||
|
|
||||||
import { PrismaClient } from '../src/generated/prisma/index.js';
|
import { execSync } from 'node:child_process';
|
||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
import { execSync } from 'child_process';
|
|
||||||
import semver from 'semver';
|
import semver from 'semver';
|
||||||
|
import { PrismaClient } from '../dist/generated/prisma/client.js';
|
||||||
|
|
||||||
if (process.env.SKIP_DB_CHECK) {
|
if (process.env.SKIP_DB_CHECK) {
|
||||||
console.log('Skipping database check.');
|
console.log('Skipping database check.');
|
||||||
|
|
@ -92,7 +92,13 @@ async function applyMigration() {
|
||||||
|
|
||||||
(async () => {
|
(async () => {
|
||||||
let err = false;
|
let err = false;
|
||||||
for (let fn of [checkEnv, checkConnection, checkDatabaseVersion, checkV1Tables, applyMigration]) {
|
for (const fn of [
|
||||||
|
checkEnv,
|
||||||
|
checkConnection,
|
||||||
|
checkDatabaseVersion,
|
||||||
|
checkV1Tables,
|
||||||
|
applyMigration,
|
||||||
|
]) {
|
||||||
try {
|
try {
|
||||||
await fn();
|
await fn();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import debug from 'debug';
|
import debug from 'debug';
|
||||||
import { PrismaClient } from '@/generated/prisma/index.js';
|
import { PrismaClient } from '@/generated/prisma/client';
|
||||||
import { readReplicas } from '@prisma/extension-read-replicas';
|
import { readReplicas } from '@prisma/extension-read-replicas';
|
||||||
import { formatInTimeZone } from 'date-fns-tz';
|
import { formatInTimeZone } from 'date-fns-tz';
|
||||||
import { MYSQL, POSTGRESQL, getDatabaseType } from '@/lib/db';
|
import { MYSQL, POSTGRESQL, getDatabaseType } from '@/lib/db';
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
"noEmit": true,
|
"noEmit": true,
|
||||||
"jsx": "preserve",
|
"jsx": "preserve",
|
||||||
"incremental": false,
|
"incremental": false,
|
||||||
"types": ["jest"],
|
"types": ["node", "jest"],
|
||||||
"typeRoots": ["node_modules/@types"],
|
"typeRoots": ["node_modules/@types"],
|
||||||
"baseUrl": ".",
|
"baseUrl": ".",
|
||||||
"paths": {
|
"paths": {
|
||||||
|
|
|
||||||
12
tsconfig.prisma.json
Normal file
12
tsconfig.prisma.json
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
{
|
||||||
|
"extends": "./tsconfig.json",
|
||||||
|
"include": ["src/generated/prisma/client.ts"],
|
||||||
|
"compilerOptions": {
|
||||||
|
"outDir": "dist/generated/prisma",
|
||||||
|
"module": "ESNext",
|
||||||
|
"moduleResolution": "Node",
|
||||||
|
"target": "ES2020",
|
||||||
|
"declaration": false,
|
||||||
|
"noEmit": false
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue