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.

Sign up for GitHub

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

Jump to bottom

fix(client): use findSync only if no __dirname #12427

Merged
merged 9 commits into from
Mar 23, 2022
Merged

fix(client): use findSync only if no __dirname #12427

merged 9 commits into from
Mar 23, 2022

Conversation

millsp
Copy link
Member

@millsp millsp commented Mar 18, 2022 •
edited

Fixes #12083
Fixes #10512

@millsp millsp linked an issue Mar 18, 2022 that may be closed by this pull request
Prisma 3.9.x+ multiple clients being generated, and in the wrong Yarn 1 workspace #12083
Closed
@millsp millsp changed the title fix(client): use findSync only when no alternative fix(client): use findSync only no __dirname Mar 18, 2022
@millsp millsp changed the title fix(client): use findSync only no __dirname fix(client): use findSync only if no __dirname Mar 18, 2022
@millsp millsp marked this pull request as draft March 18, 2022 18:53
@Jolg42 Jolg42 added this to the 3.12.0 milestone Mar 22, 2022
@millsp millsp mentioned this pull request Mar 22, 2022
Merged
@millsp millsp marked this pull request as ready for review March 22, 2022 16:18
@millsp millsp requested a review from Jolg42 March 23, 2022 11:39
Jolg42
Jolg42 approved these changes Mar 23, 2022
View reviewed changes
Copy link
Member

@Jolg42 Jolg42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤞🏼

Can't wait to see if we can remove all of this complexity with schema embedding

@millsp @aqrln
Update packages/client/src/generation/generateClient.ts
4c997c7 
Co-authored-by: Alexey Orlenko <alex@aqrln.net>
@millsp millsp merged commit a7e6db5 into main Mar 23, 2022
@millsp millsp deleted the integration/fix/yarn1-workspaces branch March 23, 2022 18:38
@millsp millsp mentioned this pull request Mar 24, 2022
Closed
@Faithfinder
Copy link

Is there a build I can install to try it out, or do I wait for... 3.12, I guess?

@millsp
Copy link
Member Author

millsp commented Mar 24, 2022 •
edited

You can try it via prisma@dev & @prisma/client@dev

@millsp millsp restored the integration/fix/yarn1-workspaces branch March 24, 2022 14:03
@Faithfinder
Copy link

Thank you! Just checked and it works with our setup as well (rush monorepo with pnpm as package manager). 🥳

@millsp millsp mentioned this pull request Mar 24, 2022
Merged
@Jolg42 Jolg42 deleted the integration/fix/yarn1-workspaces branch March 24, 2022 16:29
@Jolg42 Jolg42 restored the integration/fix/yarn1-workspaces branch March 24, 2022 16:29
@millsp millsp deleted the integration/fix/yarn1-workspaces branch March 25, 2022 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@janpio janpio janpio left review comments

@Jolg42 Jolg42 Jolg42 approved these changes

@aqrln aqrln aqrln approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.12.0
5 participants
@millsp @Faithfinder @janpio @Jolg42 @aqrln