Skip to content

Conversation

jkomyno
Copy link
Contributor

@jkomyno jkomyno commented Oct 18, 2024

BREAKING

Fixes https://github.com/prisma/team-orm/issues/1326, closes ORM-310.
This is for Prisma 6. We're merging this to feat/next until we're ready for rebasing that branch into main.


This PR gets rid of custom schema.prisma detection logic for yarn.
Some considerations:

  • yarn was something of a unique scenario; for instance, we've never had any custom schema.prisma lookup logic for pnpm workspaces

  • Prisma will no longer be able to automatically to climb up the workspace tree to find the schema.prisma file defined in the root of the workspace. E.g., say that the directory tree is

    .
    ├── db
    │   └── schema.prisma
    ├── package.json
    └── packages
        ├── a
        │   └── package.json
        └── b
            └── package.json
    

    and the root package.json is

    {
      "name": "pkg-json-workspace-parent",
      "workspaces": [
        "packages/*"
      ],
      "private": true,
      "prisma": {
        "schema": "./db/schema.prisma"
      }
    }

    which contains the prisma.schema attribute.

    If we're running prisma generate in ./packages/a, we'll no longer climb up to ./package.json, read its prisma.schema attribute, and use ./db/schema.prisma as the default argument for prisma generate --schema <PRISMA_SCHEMA_PATH>.

@jkomyno jkomyno self-assigned this Oct 18, 2024
Copy link
Contributor

github-actions bot commented Oct 18, 2024

size-limit report 📦

Path Size
packages/client/runtime/library.js 186.4 KB (0%)
packages/client/runtime/library.d.ts 81 B (0%)
packages/client/runtime/binary.js 607.44 KB (0%)
packages/client/runtime/binary.d.ts 26 B (0%)
packages/client/runtime/edge.js 162.17 KB (0%)
packages/client/runtime/edge-esm.js 161.97 KB (0%)
packages/client/runtime/wasm.js 120.97 KB (0%)
packages/client/runtime/index-browser.js 33.9 KB (0%)
packages/client/runtime/index-browser.d.ts 89 B (0%)
packages/cli/build/index.js 2.13 MB (-0.11% 🔽)
packages/client/prisma-client-0.0.0.tgz 2.89 MB (+0.01% 🔺)
packages/cli/prisma-0.0.0.tgz 3.73 MB (-0.02% 🔽)
packages/bundle-size/da-workers-libsql/output.tgz 864.34 KB (0%)
packages/bundle-size/da-workers-neon/output.tgz 943.72 KB (0%)
packages/bundle-size/da-workers-pg/output.tgz 962.18 KB (0%)
packages/bundle-size/da-workers-pg-worker/output.tgz 917.92 KB (0%)
packages/bundle-size/da-workers-planetscale/output.tgz 878.9 KB (0%)
packages/bundle-size/da-workers-d1/output.tgz 836.71 KB (+0.01% 🔺)

@jkomyno jkomyno added this to the 6.0.0 milestone Oct 24, 2024
@jkomyno jkomyno changed the base branch from main to feat/next October 24, 2024 11:15
@jkomyno jkomyno marked this pull request as ready for review October 24, 2024 11:19
@dosubot dosubot bot added the size:L This PR changes 100-499 lines, ignoring generated files. label Oct 24, 2024
- fix #25478

`prisma version --json` should not contain non-json string.
Copy link

codspeed-hq bot commented Oct 30, 2024

CodSpeed Performance Report

Merging #25457 will not alter performance

Comparing integration/remove-custom-yarn-logic (9189c93) with main (738d5b7)

Summary

✅ 3 untouched benchmarks

@jkomyno jkomyno force-pushed the integration/remove-custom-yarn-logic branch from c9f3883 to 9189c93 Compare October 31, 2024 10:32
@jkomyno jkomyno merged commit b0ca0f7 into feat/next Oct 31, 2024
218 checks passed
@jkomyno jkomyno deleted the integration/remove-custom-yarn-logic branch October 31, 2024 10:55
jkomyno added a commit that referenced this pull request Nov 21, 2024
* feat(cli): [BREAKING] remove custom yarn logic

* test(internals): update snapshots

* chore(internals): get rid of unused fixtures

* chore: removed unused file

* chore: restore yarn detection logic for Windows

---------
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L This PR changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants