Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: drop prisma build #4346

Merged
merged 3 commits into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/vercel/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ runs:
"framework": "remix",
"devCommand": "pnpm dev",
"installCommand": "pnpm install",
"buildCommand": "pnpm --filter=@webstudio-is/prisma-client build:prod && pnpm --filter=@webstudio-is/http-client build && pnpm --filter=@webstudio-is/builder build",
"buildCommand": "pnpm --filter=@webstudio-is/http-client build && pnpm --filter=@webstudio-is/builder build",
"outputDirectory": null,
"rootDirectory": "apps/builder",
"directoryListing": false,
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/migrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ jobs:
- name: pnpm instal
run: pnpm install --ignore-scripts

- name: build prisma client
run: pnpm --filter '@webstudio-is/prisma-client...' run build

- name: execute migration
run: pnpm --filter '@webstudio-is/prisma-client' run migrations migrate
env:
Expand Down Expand Up @@ -105,9 +102,6 @@ jobs:
- name: pnpm instal
run: pnpm install --ignore-scripts

- name: build prisma client
run: pnpm --filter '@webstudio-is/prisma-client...' run build

- name: get pending
id: pending
run: |
Expand Down
4 changes: 1 addition & 3 deletions apps/builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
"dev": "remix vite:dev",
"dev:auth": "DEBUG=OAuth2Strategy,ws:* remix vite:dev",
"typecheck": "tsc --noEmit --emitDeclarationOnly false",
"test": "NODE_OPTIONS=--experimental-vm-modules jest",
"ci:migrate": "migrations migrate"
"test": "NODE_OPTIONS=--experimental-vm-modules jest"
},
"dependencies": {
"@atlaskit/pragmatic-drag-and-drop": "^1.3.1",
Expand Down Expand Up @@ -134,7 +133,6 @@
"@types/react": "^18.2.70",
"@types/react-dom": "^18.2.25",
"@webstudio-is/jest-config": "workspace:*",
"@webstudio-is/prisma-client": "workspace:*",
"@webstudio-is/tsconfig": "workspace:*",
"html-tags": "^4.0.0",
"react-router-dom": "^6.26.2",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"format": "prettier --write \"**/*.{ts,tsx,md}\"",
"storybook:dev": "storybook dev -p 6006",
"storybook:build": "storybook build",
"migrations": "cd apps/builder && pnpm migrations --dev",
"migrations": "pnpm --filter=./packages/prisma-client migrations --dev --cwd ../../apps/builder",
"build-figma-tokens": "cd packages/design-system && pnpm build-figma-tokens",
"prepare": "which git && git config core.hooksPath .git/hooks/ && simple-git-hooks || echo git not installed",
"local:version-snapshot": "pnpm -r exec pnpm version prepatch --preid $(cat /dev/urandom | LC_ALL=C tr -dc 'a-z' | fold -w 8 | head -n 1)",
Expand Down
4 changes: 4 additions & 0 deletions packages/prisma-client/migrations-cli/args.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ export const { values, positionals } = parseArgs({
args: process.argv.slice(2),
allowPositionals: true,
options: {
cwd: {
type: "string",
default: "./",
},
dev: {
type: "boolean",
},
Expand Down
4 changes: 3 additions & 1 deletion packages/prisma-client/migrations-cli/cli.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
#!/usr/bin/env tsx

import { loadEnvFile } from "node:process";
import { chdir, loadEnvFile } from "node:process";
import * as commands from "./commands";
import * as logger from "./logger";
import * as args from "./args";
import { UserError } from "./errors";

chdir(args.values.cwd);

const USAGE = `Usage: migrations <command> [--dev]

Commands:
Expand Down
8 changes: 0 additions & 8 deletions packages/prisma-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,7 @@
"homepage": "https://webstudio.is",
"type": "module",
"scripts": {
"typecheck": "tsc",
"dev": "pnpm build",
"build": "prisma format && pnpm generate && esbuild src/prisma.ts --outdir=lib --format=cjs && cp src/cjs/package.json lib && rm -rf lib/__generated__ && cp -r src/__generated__ lib/__generated__ && pnpm dts",
"generate": "PRISMA_BINARY_TARGET=${PRISMA_BINARY_TARGET:-'[\"native\"]'} prisma generate",
"build:prod": "PRISMA_BINARY_TARGET='[\"rhel-openssl-3.0.x\"]' pnpm build",
"dts": "tsc --declarationDir lib",
"migrations": "./migrations-cli/cli.ts"
},
"bin": {
"migrations": "./migrations-cli/cli.ts"
},
"devDependencies": {
Expand Down
3 changes: 0 additions & 3 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.