Skip to content

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.

Locally-generated Prisma client (#1290)

Mateusz Burzyńskid42d8dcc1853
diff --git a/.eslintrc.js b/.eslintrc.js
index 92f30898c7..83438dc082 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -2,4 +2,5 @@ module.exports = {
root: true,
// This tells ESLint to load the config from the package `eslint-config-custom`
extends: ["@webstudio-is/eslint-config-custom"],
+ ignorePatterns: ["**/__generated__/**/*"],
};
diff --git a/apps/builder/remix.config.js b/apps/builder/remix.config.js
index 1897ee8fe3..51a36053b4 100644
--- a/apps/builder/remix.config.js
+++ b/apps/builder/remix.config.js
@@ -13,7 +13,7 @@ module.exports = {
// sym-linked and can't be hoisted. You could also manually name packages
// e.g. ["@webstudio-is/ui", ...]
serverDependenciesToBundle: [
- /@webstudio-is\/.*/,
+ /@webstudio-is\/(?!prisma-client)/,
"pretty-bytes",
"djb2a",
"nanostores",
diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.json
index 7fd2879ad9..a2ba892627 100644
--- a/packages/asset-uploader/package.json
+++ b/packages/asset-uploader/package.json
@@ -40,7 +40,7 @@
".": {
"source": "./src/index.ts",
"import": "./lib/index.js",
- "require": "./lib/cjs/index.cjs"
+ "require": "./lib/cjs/index.js"
},
"./server": "./server.js"
},
diff --git a/packages/authorization-token/package.json b/packages/authorization-token/package.json
index 8a348100f7..6ade745172 100644
--- a/packages/authorization-token/package.json
+++ b/packages/authorization-token/package.json
@@ -30,7 +30,7 @@
".": {
"source": "./src/index.ts",
"import": "./lib/index.js",
- "require": "./lib/cjs/index.cjs"
+ "require": "./lib/cjs/index.js"
},
"./server": "./server.js"
},
diff --git a/packages/css-data/package.json b/packages/css-data/package.json
index 2f222f2274..5cc0f3fcfa 100644
--- a/packages/css-data/package.json
+++ b/packages/css-data/package.json
@@ -31,7 +31,7 @@
"exports": {
"source": "./src/index.ts",
"import": "./lib/index.js",
- "require": "./lib/cjs/index.cjs"
+ "require": "./lib/cjs/index.js"
},
"types": "src/index.ts",
"files": [
diff --git a/packages/css-vars/package.json b/packages/css-vars/package.json
index 6d71bb6957..8b38958e23 100644
--- a/packages/css-vars/package.json
+++ b/packages/css-vars/package.json
@@ -21,7 +21,7 @@
"exports": {
"source": "./src/index.ts",
"import": "./lib/index.js",
- "require": "./lib/cjs/index.cjs"
+ "require": "./lib/cjs/index.js"
},
"types": "src/index.ts",
"files": [
diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json
index 2e9149bdbb..584b60b0c8 100644
--- a/packages/dashboard/package.json
+++ b/packages/dashboard/package.json
@@ -31,7 +31,7 @@
".": {
"source": "./src/index.ts",
"import": "./lib/index.js",
- "require": "./lib/cjs/index.cjs"
+ "require": "./lib/cjs/index.js"
},
"./server": "./server.js"
},
diff --git a/packages/design-system/src/__generated__/figma-design-tokens.json b/packages/design-system/src/__generated__/figma-design-tokens.json
index 8f17841522..45c2258492 100644
--- a/packages/design-system/src/__generated__/figma-design-tokens.json
+++ b/packages/design-system/src/__generated__/figma-design-tokens.json
@@ -1238,8 +1238,6 @@
},
"$themes": [],
"$metadata": {
- "tokenSetOrder": [
- "global"
- ]
+ "tokenSetOrder": ["global"]
}
-}
\ No newline at end of file
+}
diff --git a/packages/fonts/package.json b/packages/fonts/package.json
index efc9b9062b..df8b59ac8b 100644
--- a/packages/fonts/package.json
+++ b/packages/fonts/package.json
@@ -35,7 +35,7 @@
".": {
"source": "./src/index.ts",
"import": "./lib/index.js",
- "require": "./lib/cjs/index.cjs"
+ "require": "./lib/cjs/index.js"
},
"./server": "./server.js"
},
diff --git a/packages/icons/package.json b/packages/icons/package.json
index 58f791f726..908369551e 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -37,7 +37,7 @@
"exports": {
"source": "./src/index.ts",
"import": "./lib/index.js",
- "require": "./lib/cjs/index.cjs"
+ "require": "./lib/cjs/index.js"
},
"types": "src/index.ts",
"files": [
diff --git a/packages/image/package.json b/packages/image/package.json
index 2457bda836..454a9b3062 100644
--- a/packages/image/package.json
+++ b/packages/image/package.json
@@ -41,7 +41,7 @@
"exports": {
"source": "./src/index.ts",
"import": "./lib/index.js",
- "require": "./lib/cjs/index.cjs"
+ "require": "./lib/cjs/index.js"
},
"types": "src/index.ts",
"files": [
diff --git a/packages/prisma-client/.gitignore b/packages/prisma-client/.gitignore
new file mode 100644
index 0000000000..1156b277ce
--- /dev/null
+++ b/packages/prisma-client/.gitignore
@@ -0,0 +1 @@
+src/__generated__
diff --git a/packages/prisma-client/package.json b/packages/prisma-client/package.json
index b8114b46e8..7508c58f62 100644
--- a/packages/prisma-client/package.json
+++ b/packages/prisma-client/package.json
@@ -9,14 +9,15 @@
"typecheck": "tsc --noEmit",
"lint": "eslint ./src --ext .ts,.tsx --max-warnings 0",
"checks": "pnpm typecheck && pnpm lint",
- "dev": "prisma generate --watch & build-package --watch",
- "build": "prisma format && prisma generate && build-package",
+ "dev": "prisma generate --watch & build-package --watch --no-generated-as-entries",
+ "build": "prisma format && prisma generate && build-package --no-generated-as-entries",
"migrations": "./migrations-cli/cli.ts"
},
"bin": {
"migrations": "./migrations-cli/cli.ts"
},
"devDependencies": {
+ "@prisma/client": "^4.9.0",
"@types/node": "^18.11.18",
"@types/uuid": "^8.3.4",
"@webstudio-is/scripts": "workspace:^",
@@ -28,14 +29,14 @@
},
"exports": {
"source": "./src/index.ts",
- "import": "./lib/index.js"
+ "import": "./lib/index.js",
+ "require": "./lib/cjs/index.js"
},
"types": "src/index.ts",
"license": "MIT",
"private": false,
"dependencies": {
"@inquirer/confirm": "^0.0.25-alpha.0",
- "@prisma/client": "^4.9.0",
"@types/minimist": "^1.2.2",
"dotenv": "^16.0.0",
"execa": "^6.1.0",
diff --git a/packages/prisma-client/prisma/schema.prisma b/packages/prisma-client/prisma/schema.prisma
index 64ed36a7b0..415ec9dcd5 100644
--- a/packages/prisma-client/prisma/schema.prisma
+++ b/packages/prisma-client/prisma/schema.prisma
@@ -4,6 +4,7 @@
generator client {
provider = "prisma-client-js"
previewFeatures = ["views", "clientExtensions"]
+ output = "../src/__generated__"
// <output-placeholder-for-migrations>
}
diff --git a/packages/prisma-client/src/prisma.ts b/packages/prisma-client/src/prisma.ts
index ac499311de..697802cad6 100644
--- a/packages/prisma-client/src/prisma.ts
+++ b/packages/prisma-client/src/prisma.ts
@@ -1,4 +1,4 @@
-import { PrismaClient, Prisma } from "@prisma/client";
+import { PrismaClient, Prisma } from "./__generated__";
const { PrismaClientKnownRequestError, Decimal } = Prisma;
declare global {
diff --git a/packages/prisma-client/src/types.ts b/packages/prisma-client/src/types.ts
index 847025e9ff..8d831de9ad 100644
--- a/packages/prisma-client/src/types.ts
+++ b/packages/prisma-client/src/types.ts
@@ -1,4 +1,4 @@
-export { Location } from "@prisma/client";
+export { Location } from "./__generated__";
export type {
User,
Breakpoints,
@@ -7,4 +7,4 @@ export type {
Asset,
DashboardProject,
AuthorizationToken,
-} from "@prisma/client";
+} from "./__generated__";
diff --git a/packages/project-build/package.json b/packages/project-build/package.json
index 5c1f9377fb..8245b4fdbb 100644
--- a/packages/project-build/package.json
+++ b/packages/project-build/package.json
@@ -10,7 +10,7 @@
".": {
"source": "./src/index.ts",
"import": "./lib/index.js",
- "require": "./lib/cjs/index.cjs"
+ "require": "./lib/cjs/index.js"
},
"./server": "./server.js"
},
diff --git a/packages/project/package.json b/packages/project/package.json
index 938442f499..34238db8e9 100644
--- a/packages/project/package.json
+++ b/packages/project/package.json
@@ -33,7 +33,7 @@
".": {
"source": "./src/index.ts",
"import": "./lib/index.js",
- "require": "./lib/cjs/index.cjs"
+ "require": "./lib/cjs/index.js"
},
"./server": "./server.js"
},
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
index 66da470072..0c0e439819 100644
--- a/packages/react-sdk/package.json
+++ b/packages/react-sdk/package.json
@@ -66,7 +66,7 @@
".": {
"source": "./src/index.ts",
"import": "./lib/index.js",
- "require": "./lib/cjs/index.cjs"
+ "require": "./lib/cjs/index.js"
}
},
"types": "src/index.ts",
diff --git a/packages/scripts/build-package.ts b/packages/scripts/build-package.ts
index 26006ce1a2..bd113e758c 100755
--- a/packages/scripts/build-package.ts
+++ b/packages/scripts/build-package.ts
@@ -1,19 +1,24 @@
#!/usr/bin/env tsx
-import { rm, cp } from "node:fs/promises";
+import { rm, cp, access, writeFile, mkdir } from "node:fs/promises";
import { join } from "node:path";
import { totalist } from "totalist";
-import { build, context } from "esbuild";
+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.")) {
+ if (
+ rel.includes(".test.") ||
+ rel.includes(".stories.") ||
+ (noGeneratedAsEntries && rel.includes("__generated__/"))
+ ) {
return;
}
entryPoints.push(join("src", rel));
@@ -24,21 +29,22 @@ await totalist("./src", (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 = {
+const esmConfig: BuildOptions = {
entryPoints,
outdir: "lib",
format: "esm",
-} as const;
+};
-const cjsConfig = {
+const cjsConfig: BuildOptions = {
entryPoints,
outdir: "lib/cjs",
format: "cjs",
- outExtension: {
- ".js": ".cjs",
- },
-} as const;
+};
if (watch) {
const esmContext = await context(esmConfig);
@@ -50,11 +56,31 @@ if (watch) {
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 {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a722b973d5..dd2785178a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -992,9 +992,6 @@ importers:
'@inquirer/confirm':
specifier: ^0.0.25-alpha.0
version: 0.0.25-alpha.0
- '@prisma/client':
- specifier: ^4.9.0
- version: 4.9.0([email protected])
'@types/minimist':
specifier: ^1.2.2
version: 1.2.2
@@ -1017,6 +1014,9 @@ importers:
specifier: ^9.0.0
version: 9.0.0
devDependencies:
+ '@prisma/client':
+ specifier: ^4.9.0
+ version: 4.9.0([email protected])
'@types/node':
specifier: ^18.11.18
version: 18.11.18
@@ -5159,15 +5159,16 @@ packages:
dependencies:
'@prisma/engines-version': 4.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5
prisma: 4.9.0
- dev: false
+ dev: true
/@prisma/engines-version@4.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5:
resolution: {integrity: sha512-M16aibbxi/FhW7z1sJCX8u+0DriyQYY5AyeTH7plQm9MLnURoiyn3CZBqAyIoQ+Z1pS77usCIibYJWSgleBMBA==}
- dev: false
+ dev: true
resolution: {integrity: sha512-t1pt0Gsp+HcgPJrHFc+d/ZSAaKKWar2G/iakrE07yeKPNavDP3iVKPpfXP22OTCHZUWf7OelwKJxQgKAm5hkgw==}
requiresBuild: true
+ dev: true
/@radix-ui/[email protected]:
resolution: {integrity: sha512-jwRMXYwC0hUo0mv6wGpuw254Pd9p/R6Td5xsRpOmaWkUHlooNWqVcadgyzlRumMq3xfOTXwJReU0Jv+EIy4Jbw==}
@@ -16688,6 +16689,7 @@ packages:
requiresBuild: true
dependencies:
'@prisma/engines': 4.9.0
+ dev: true
resolution: {integrity: sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw==}