Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
refactor: bump prisma (#3115)
Bogdan Chadkinb93a7ab1811c
diff --git a/apps/builder/package.json b/apps/builder/package.jsonindex 0f1f4fd07b..89b7868c42 100644--- a/apps/builder/package.json+++ b/apps/builder/package.json@@ -7,7 +7,7 @@"generate-metas": "pnpm tsx scripts/generate-metas.mts","prebuild": "which remix","build": "pnpm generate-metas && remix build",- "start": "remix-serve build",+ "start": "remix-serve build/index.js","start-local": "NODE_OPTIONS='-r dotenv/config' remix-serve build","dev": "pnpm generate-metas && remix dev","typecheck": "tsc --noEmit --emitDeclarationOnly false",diff --git a/packages/ai/package.json b/packages/ai/package.jsonindex dc5c8e1e76..a024e2bc8f 100644--- a/packages/ai/package.json+++ b/packages/ai/package.json@@ -17,7 +17,6 @@},"devDependencies": {"@webstudio-is/jest-config": "workspace:^",- "@webstudio-is/scripts": "workspace:^","@webstudio-is/tsconfig": "workspace:^","fast-glob": "^3.2.12","type-fest": "^4.3.1",diff --git a/packages/jsx-utils/package.json b/packages/jsx-utils/package.jsonindex be02665cbe..375d807ea8 100644--- a/packages/jsx-utils/package.json+++ b/packages/jsx-utils/package.json@@ -16,7 +16,6 @@},"devDependencies": {"@webstudio-is/jest-config": "workspace:^",- "@webstudio-is/scripts": "workspace:^","@webstudio-is/tsconfig": "workspace:^","fast-glob": "^3.2.12","type-fest": "^4.3.1",diff --git a/packages/prisma-client/package.json b/packages/prisma-client/package.jsonindex a1bfadb6e9..62948c4de9 100644--- a/packages/prisma-client/package.json+++ b/packages/prisma-client/package.json@@ -8,8 +8,8 @@"scripts": {"typecheck": "tsc","checks": "pnpm typecheck",- "dev": "prisma generate --watch & build-package --watch --no-generated-as-entries",- "build": "prisma format && prisma generate && build-package --no-generated-as-entries",+ "dev": "pnpm build",+ "build": "prisma format && prisma generate && esbuild src/prisma.ts --outdir=lib --format=cjs && cp src/cjs/package.json lib && cp -r src/__generated__ lib/__generated__","dts": "tsc --declarationDir lib","migrations": "./migrations-cli/cli.ts"},@@ -17,21 +17,20 @@"migrations": "./migrations-cli/cli.ts"},"devDependencies": {- "@prisma/client": "^5.8.1",+ "@prisma/client": "^5.12.1","@types/node": "^18.17.1","@types/prompts": "^2.4.5",- "@webstudio-is/scripts": "workspace:*","@webstudio-is/tsconfig": "workspace:*",- "prisma": "^5.8.1",+ "prisma": "^5.12.1","tsx": "^4.7.2","typescript": "5.2.2","zod": "^3.22.4"},"exports": {- "webstudio": "./src/index.ts",- "types": "./lib/index.d.ts",- "import": "./lib/index.js",- "require": "./lib/cjs/index.js"+ "webstudio": "./src/prisma.ts",+ "types": "./lib/prisma.d.ts",+ "import": "./lib/prisma.js",+ "require": "./lib/prisma.js"},"license": "AGPL-3.0-or-later","private": true,diff --git a/packages/prisma-client/prisma.mjs b/packages/prisma-client/prisma.mjsnew file mode 100644index 0000000000..172fd77d2b--- /dev/null+++ b/packages/prisma-client/prisma.mjs@@ -0,0 +1,3 @@+import pkg from "./lib/prisma.js";++export const { prisma, Prisma, PrismaClientKnownRequestError, Decimal } = pkg;diff --git a/packages/prisma-client/src/cjs/package.json b/packages/prisma-client/src/cjs/package.jsonnew file mode 100644index 0000000000..5bbefffbab--- /dev/null+++ b/packages/prisma-client/src/cjs/package.json@@ -0,0 +1,3 @@+{+ "type": "commonjs"+}diff --git a/packages/prisma-client/src/index.ts b/packages/prisma-client/src/index.tsdeleted file mode 100644index adcafa20ee..0000000000--- a/packages/prisma-client/src/index.ts+++ /dev/null@@ -1,2 +0,0 @@-export * from "./prisma";-export * from "./types";diff --git a/packages/prisma-client/src/prisma.ts b/packages/prisma-client/src/prisma.tsindex a5ac798b17..0568d201f6 100644--- a/packages/prisma-client/src/prisma.ts+++ b/packages/prisma-client/src/prisma.ts@@ -1,5 +1,25 @@import { PrismaClient, Prisma } from "./__generated__";-const { PrismaClientKnownRequestError, Decimal } = Prisma;++export type {+ User,+ Build,+ Project,+ Asset,+ File,+ DashboardProject,+ AuthorizationToken,+ DomainStatus,+ Domain,+ ProjectWithDomain,+ LatestBuildPerProjectDomain,+ LatestBuildPerProject,+ PublishStatus,+ Product,+ $Enums,+} from "./__generated__";++export { Prisma };+export const { PrismaClientKnownRequestError, Decimal } = Prisma;declare global {// allow global `var` declarations@@ -65,5 +85,3 @@ prisma.$on("query", (e) => {if (process.env.NODE_ENV !== "production") {global.prisma = prisma;}--export { Prisma, PrismaClientKnownRequestError, Decimal };diff --git a/packages/prisma-client/src/types.ts b/packages/prisma-client/src/types.tsdeleted file mode 100644index 0386ee2565..0000000000--- a/packages/prisma-client/src/types.ts+++ /dev/null@@ -1,17 +0,0 @@-export type {- User,- Build,- Project,- Asset,- File,- DashboardProject,- AuthorizationToken,- DomainStatus,- Domain,- ProjectWithDomain,- LatestBuildPerProjectDomain,- LatestBuildPerProject,- PublishStatus,- Product,- $Enums,-} from "./__generated__";diff --git a/packages/scripts/build-package.ts b/packages/scripts/build-package.tsdeleted file mode 100755index bd113e758c..0000000000--- a/packages/scripts/build-package.ts+++ /dev/null@@ -1,88 +0,0 @@-#!/usr/bin/env tsx--import { rm, cp, access, writeFile, mkdir } from "node:fs/promises";-import { join } from "node:path";-import { totalist } from "totalist";-import { build, context, type BuildOptions } from "esbuild";--const args = process.argv.slice(2);-const watch = args.includes("--watch");-const noGeneratedAsEntries = args.includes("--no-generated-as-entries");--const entryPoints: string[] = [];-const assets: string[] = [];--await totalist("./src", (rel) => {- if (rel.endsWith(".ts") || rel.endsWith(".tsx")) {- if (- rel.includes(".test.") ||- rel.includes(".stories.") ||- (noGeneratedAsEntries && rel.includes("__generated__/"))- ) {- return;- }- entryPoints.push(join("src", rel));- }- if (rel.endsWith(".json")) {- assets.push(rel);- }-});--await rm("lib", { recursive: true, force: true });-// regenerate them so we can safely write files into those directories without relying on esbuild creating them-// in the watch mode esbuild might not create them soon enough for them to be available for other parts of the script-await mkdir("lib");-await mkdir("lib/cjs");--const esmConfig: BuildOptions = {- entryPoints,- outdir: "lib",- format: "esm",-};--const cjsConfig: BuildOptions = {- entryPoints,- outdir: "lib/cjs",- format: "cjs",-};--if (watch) {- const esmContext = await context(esmConfig);- await esmContext.watch();- const cjsContext = await context(cjsConfig);- await cjsContext.watch();-} else {- await build(esmConfig);- await build(cjsConfig);-}--await writeFile(- "lib/cjs/package.json",- JSON.stringify({ type: "commonjs" }) + "\n",- "utf8"-);--for (const rel of assets) {- await cp(join("src", rel), join("lib", rel));- await cp(join("src", rel), join("lib/cjs", rel));-}--if (noGeneratedAsEntries) {- try {- await access("./src/__generated__");- await Promise.all([- cp("./src/__generated__", "./lib/__generated__", { recursive: true }),- cp("./src/__generated__", "./lib/cjs/__generated__", {- recursive: true,- }),- ]);- } catch {- // noop- }-}--if (watch) {- console.info("watching...");-} else {- console.info("build succeeded");-}diff --git a/packages/scripts/package.json b/packages/scripts/package.jsondeleted file mode 100644index b9f5c64464..0000000000--- a/packages/scripts/package.json+++ /dev/null@@ -1,26 +0,0 @@-{- "name": "@webstudio-is/scripts",- "private": true,- "version": "0.0.0",- "description": "Command line util for building packages fast",- "author": "Webstudio <[email protected]>",- "homepage": "https://webstudio.is",- "license": "AGPL-3.0-or-later",- "type": "module",- "bin": {- "build-package": "./build-package.ts"- },- "scripts": {- "checks": "tsc --noEmit --emitDeclarationOnly false"- },- "dependencies": {- "esbuild": "^0.20.2",- "totalist": "^3.0.1"- },- "devDependencies": {- "@types/node": "^18.17.1",- "@webstudio-is/tsconfig": "workspace:*",- "tsx": "^4.7.2",- "typescript": "5.2.2"- }-}diff --git a/packages/scripts/tsconfig.json b/packages/scripts/tsconfig.jsondeleted file mode 100644index a845858c30..0000000000--- a/packages/scripts/tsconfig.json+++ /dev/null@@ -1,7 +0,0 @@-{- "extends": "@webstudio-is/tsconfig/base.json",- "compilerOptions": {- "module": "ES2022",- "target": "ES2022"- }-}diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 1b64b1e368..6f7e853a3e 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -734,9 +734,6 @@ importers:'@webstudio-is/jest-config':specifier: workspace:^version: link:../jest-config- '@webstudio-is/scripts':- specifier: workspace:^- version: link:../scripts'@webstudio-is/tsconfig':specifier: workspace:^version: link:../tsconfig@@ -1452,9 +1449,6 @@ importers:'@webstudio-is/jest-config':specifier: workspace:^version: link:../jest-config- '@webstudio-is/scripts':- specifier: workspace:^- version: link:../scripts'@webstudio-is/tsconfig':specifier: workspace:^version: link:../tsconfig@@ -1487,23 +1481,20 @@ importers:version: 3.2.1devDependencies:'@prisma/client':- specifier: ^5.8.1- version: 5.8.1([email protected])+ specifier: ^5.12.1+ version: 5.12.1([email protected])'@types/node':specifier: ^18.17.1version: 18.17.1'@types/prompts':specifier: ^2.4.5version: 2.4.5- '@webstudio-is/scripts':- specifier: workspace:*- version: link:../scripts'@webstudio-is/tsconfig':specifier: workspace:*version: link:../tsconfigprisma:- specifier: ^5.8.1- version: 5.8.1+ specifier: ^5.12.1+ version: 5.12.1tsx:specifier: ^4.7.2version: 4.7.2@@ -1655,28 +1646,6 @@ importers:specifier: ^3.22.4version: 3.22.4- packages/scripts:- dependencies:- esbuild:- specifier: ^0.20.2- version: 0.20.2- totalist:- specifier: ^3.0.1- version: 3.0.1- devDependencies:- '@types/node':- specifier: ^18.17.1- version: 18.17.1- '@webstudio-is/tsconfig':- specifier: workspace:*- version: link:../tsconfig- tsx:- specifier: ^4.7.2- version: 4.7.2- typescript:- specifier: 5.2.2- version: 5.2.2-packages/sdk:dependencies:'@webstudio-is/css-engine':@@ -4707,8 +4676,8 @@ packages:requiresBuild: trueoptional: true- /@prisma/[email protected]([email protected]):- resolution: {integrity: sha512-xQtMPfbIwLlbm0VVIVQY2yqQVOxPwRQhvIp7Z3m2900g1bu/zRHKhYZJQWELqmjl6d8YwBy0K2NvMqh47v1ubw==}+ /@prisma/[email protected]([email protected]):+ resolution: {integrity: sha512-6/JnizEdlSBxDIdiLbrBdMW5NqDxOmhXAJaNXiPpgzAPr/nLZResT6MMpbOHLo5yAbQ1Vv5UU8PTPRzb0WIxdA==}engines: {node: '>=16.13'}requiresBuild: truepeerDependencies:@@ -4717,39 +4686,39 @@ packages:prisma:optional: truedependencies:- prisma: 5.8.1+ prisma: 5.12.1dev: true- /@prisma/[email protected]:- resolution: {integrity: sha512-tjuw7eA0Us3T42jx9AmAgL58rzwzpFGYc3R7Y4Ip75EBYrKMBA1YihuWMcBC92ILmjlQ/u3p8VxcIE0hr+fZfg==}+ /@prisma/[email protected]:+ resolution: {integrity: sha512-kd/wNsR0klrv79o1ITsbWxYyh4QWuBidvxsXSParPsYSu0ircUmNk3q4ojsgNc3/81b0ozg76iastOG43tbf8A==}dev: true- /@prisma/[email protected]:- resolution: {integrity: sha512-f5C3JM3l9yhGr3cr4FMqWloFaSCpNpMi58Om22rjD2DOz3owci2mFdFXMgnAGazFPKrCbbEhcxdsRfspEYRoFQ==}+ /@prisma/engines-version@5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab:+ resolution: {integrity: sha512-6yvO8s80Tym61aB4QNtYZfWVmE3pwqe807jEtzm8C5VDe7nw8O1FGX3TXUaXmWV0fQTIAfRbeL2Gwrndabp/0g==}dev: true- /@prisma/[email protected]:- resolution: {integrity: sha512-TJgYLRrZr56uhqcXO4GmP5be+zjCIHtLDK20Cnfg+o9d905hsN065QOL+3Z0zQAy6YD31Ol4u2kzSfRmbJv/uA==}+ /@prisma/[email protected]:+ resolution: {integrity: sha512-HQDdglLw2bZR/TXD2Y+YfDMvi5Q8H+acbswqOsWyq9pPjBLYJ6gzM+ptlTU/AV6tl0XSZLU1/7F4qaWa8bqpJA==}requiresBuild: truedependencies:- '@prisma/debug': 5.8.1- '@prisma/engines-version': 5.8.1-1.78caf6feeaed953168c64e15a249c3e9a033ebe2- '@prisma/fetch-engine': 5.8.1- '@prisma/get-platform': 5.8.1+ '@prisma/debug': 5.12.1+ '@prisma/engines-version': 5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab+ '@prisma/fetch-engine': 5.12.1+ '@prisma/get-platform': 5.12.1dev: true- /@prisma/[email protected]:- resolution: {integrity: sha512-+bgjjoSFa6uYEbAPlklfoVSStOEfcpheOjoBoNsNNSQdSzcwE2nM4Q0prun0+P8/0sCHo18JZ9xqa8gObvgOUw==}+ /@prisma/[email protected]:+ resolution: {integrity: sha512-qSs3KcX1HKcea1A+hlJVK/ljj0PNIUHDxAayGMvgJBqmaN32P9tCidlKz1EGv6WoRFICYnk3Dd/YFLBwnFIozA==}dependencies:- '@prisma/debug': 5.8.1- '@prisma/engines-version': 5.8.1-1.78caf6feeaed953168c64e15a249c3e9a033ebe2- '@prisma/get-platform': 5.8.1+ '@prisma/debug': 5.12.1+ '@prisma/engines-version': 5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab+ '@prisma/get-platform': 5.12.1dev: true- /@prisma/[email protected]:- resolution: {integrity: sha512-wnA+6HTFcY+tkykMokix9GiAkaauPC5W/gg0O5JB0J8tCTNWrqpnQ7AsaGRfkYUbeOIioh6woDjQrGTTRf1Zag==}+ /@prisma/[email protected]:+ resolution: {integrity: sha512-pgIR+pSvhYHiUcqXVEZS31NrFOTENC9yFUdEAcx7cdQBoZPmHVjtjN4Ss6NzVDMYPrKJJ51U14EhEoeuBlMioQ==}dependencies:- '@prisma/debug': 5.8.1+ '@prisma/debug': 5.12.1dev: true/@radix-ui/[email protected]:@@ -14306,13 +14275,13 @@ packages:dependencies:parse-ms: 2.1.0- resolution: {integrity: sha512-N6CpjzECnUHZ5beeYpDzkt2rYpEdAeqXX2dweu6BoQaeYkNZrC/WJHM+5MO/uidFHTak8QhkPKBWck1o/4MD4A==}+ resolution: {integrity: sha512-SkMnb6wyIxTv9ACqiHBI2u9gD6y98qXRoCoLEnZsF6yee5Qg828G+ARrESN+lQHdw4maSZFFSBPPDpvSiVTo0Q==}engines: {node: '>=16.13'}hasBin: truerequiresBuild: truedependencies:- '@prisma/engines': 5.8.1+ '@prisma/engines': 5.12.1dev: true@@ -15933,11 +15902,6 @@ packages:resolution: {integrity: sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==}- resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}- engines: {node: '>=6'}- dev: false-resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==}engines: {node: '>=6'}