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

chore(client): fix isolated data proxy issues [DPGA, 3] #13599

Merged
merged 9 commits into from Jun 7, 2022
Merged

chore(client): fix isolated data proxy issues [DPGA, 3] #13599

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
13bd199
handle and retry on network errors
millsp Jun 1, 2022
ce8ce77
fix missing require('path') in node.js
millsp Jun 1, 2022
3206067
let the data proxy look for dirname
millsp Jun 1, 2022
ca0c722
fix error with custom schema location not found
millsp Jun 1, 2022
2654584
try to fix bug where ts-jest hangs
millsp Jun 1, 2022
78635f7
make dataProxy required after fixing ts-jest issue
millsp Jun 1, 2022
c7e0175
Merge branch 'chore/data-proxy-ga-2' of github.com:prisma/prisma into…
millsp Jun 3, 2022
91ea26a
Merge branch 'chore/data-proxy-ga-2' into chore/data-proxy-ga-3
millsp Jun 7, 2022
ce2a8f7
chore(cli, client): check that `prisma://` cannot be used with unsupp…
millsp Jun 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/client/src/generation/TSClient/TSClient.ts
View file
Open in desktop
Expand Up @@ -97,7 +97,7 @@ export class TSClient implements Generatable {

const code = `${commonCodeJS({ ...this.options, browser: false })}
${buildRequirePath(edge)}
millsp marked this conversation as resolved.
Show resolved Hide resolved
${buildDirname(dataProxy, relativeOutdir, runtimeDir)}
${buildDirname(edge, relativeOutdir, runtimeDir)}
millsp marked this conversation as resolved.
Show resolved Hide resolved
/**
* Enums
*/
Expand Down
6 changes: 3 additions & 3 deletions packages/client/src/generation/utils/buildDirname.ts
View file
Open in desktop
Expand Up @@ -2,13 +2,13 @@ import path from 'path'

/**
* Builds a `dirname` variable that holds the location of the generated client.
* @param dataProxy
* @param edge
* @param relativeOutdir
* @param runtimeDir
* @returns
*/
export function buildDirname(dataProxy: boolean | undefined, relativeOutdir: string, runtimeDir: string) {
if (dataProxy === true) {
export function buildDirname(edge: boolean | undefined, relativeOutdir: string, runtimeDir: string) {
if (edge === true) {
millsp marked this conversation as resolved.
Show resolved Hide resolved
return buildDirnameDefault()
}

Expand Down