mirror of
https://github.com/Drop-OSS/drop.git
synced 2025-11-20 19:51:09 +10:00
Merge branch 'develop' into v4
This commit is contained in:
@ -45,12 +45,12 @@ ENV NODE_ENV=production
|
|||||||
ENV NUXT_TELEMETRY_DISABLED=1
|
ENV NUXT_TELEMETRY_DISABLED=1
|
||||||
|
|
||||||
# RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn add --network-timeout 1000000 --no-lockfile --ignore-scripts prisma@6.11.1
|
# RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn add --network-timeout 1000000 --no-lockfile --ignore-scripts prisma@6.11.1
|
||||||
RUN apk add --no-cache pnpm
|
RUN apk add --no-cache pnpm 7zip
|
||||||
RUN pnpm install prisma@6.11.1
|
RUN pnpm install prisma@6.11.1
|
||||||
# init prisma to download all required files
|
# init prisma to download all required files
|
||||||
RUN pnpm prisma init
|
RUN pnpm prisma init
|
||||||
|
|
||||||
COPY --from=build-system /app/package.json ./
|
COPY --from=build-system /app/prisma.config.ts ./
|
||||||
COPY --from=build-system /app/.output ./app
|
COPY --from=build-system /app/.output ./app
|
||||||
COPY --from=build-system /app/prisma ./prisma
|
COPY --from=build-system /app/prisma ./prisma
|
||||||
COPY --from=build-system /app/build ./startup
|
COPY --from=build-system /app/build ./startup
|
||||||
|
|||||||
@ -47,7 +47,7 @@
|
|||||||
"nuxt-security": "2.2.0",
|
"nuxt-security": "2.2.0",
|
||||||
"pino": "^9.7.0",
|
"pino": "^9.7.0",
|
||||||
"pino-pretty": "^13.0.0",
|
"pino-pretty": "^13.0.0",
|
||||||
"prisma": "^6.11.1",
|
"prisma": "6.11.1",
|
||||||
"sanitize-filename": "^1.6.3",
|
"sanitize-filename": "^1.6.3",
|
||||||
"semver": "^7.7.1",
|
"semver": "^7.7.1",
|
||||||
"stream-mime-type": "^2.0.0",
|
"stream-mime-type": "^2.0.0",
|
||||||
@ -87,8 +87,5 @@
|
|||||||
"vue3-carousel": "^0.16.0"
|
"vue3-carousel": "^0.16.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"prisma": {
|
|
||||||
"schema": "./prisma"
|
|
||||||
},
|
|
||||||
"packageManager": "pnpm@10.15.0+sha512.486ebc259d3e999a4e8691ce03b5cac4a71cbeca39372a9b762cb500cfdf0873e2cb16abe3d951b1ee2cf012503f027b98b6584e4df22524e0c7450d9ec7aa7b"
|
"packageManager": "pnpm@10.15.0+sha512.486ebc259d3e999a4e8691ce03b5cac4a71cbeca39372a9b762cb500cfdf0873e2cb16abe3d951b1ee2cf012503f027b98b6584e4df22524e0c7450d9ec7aa7b"
|
||||||
}
|
}
|
||||||
|
|||||||
6752
pnpm-lock.yaml
generated
6752
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@ -1,8 +1,9 @@
|
|||||||
onlyBuiltDependencies:
|
onlyBuiltDependencies:
|
||||||
- '@prisma/client'
|
|
||||||
- '@prisma/engines'
|
|
||||||
- '@tailwindcss/oxide'
|
|
||||||
- esbuild
|
- esbuild
|
||||||
- prisma
|
|
||||||
|
|
||||||
shamefullyHoist: true
|
overrides:
|
||||||
|
glob@>=10.2.0 <10.5.0: '>=10.5.0'
|
||||||
|
js-yaml@>=4.0.0 <4.1.1: '>=4.1.1'
|
||||||
|
tar-fs@>=2.0.0 <2.1.4: '>=2.1.4'
|
||||||
|
tar-fs@>=3.0.0 <3.1.1: '>=3.1.1'
|
||||||
|
tmp@<=0.2.3: '>=0.2.4'
|
||||||
|
|||||||
7
prisma.config.ts
Normal file
7
prisma.config.ts
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
import type { PrismaConfig } from "prisma";
|
||||||
|
import path from "node:path";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
schema: path.join("prisma"),
|
||||||
|
earlyAccess: true,
|
||||||
|
} satisfies PrismaConfig;
|
||||||
@ -1,5 +1,5 @@
|
|||||||
import fs from "fs";
|
import fs from "node:fs";
|
||||||
import nodePath from "path";
|
import nodePath from "node:path";
|
||||||
|
|
||||||
export function fsStats(folderPath: string) {
|
export function fsStats(folderPath: string) {
|
||||||
const stats = fs.statfsSync(folderPath);
|
const stats = fs.statfsSync(folderPath);
|
||||||
|
|||||||
Reference in New Issue
Block a user