Skip to content

Commit a81913e

Browse files
authored
fix: vscode language accidentally bundles prisma packages (#623)
1 parent 3e09a3a commit a81913e

File tree

4 files changed

+15
-44
lines changed

4 files changed

+15
-44
lines changed

packages/schema/build/bundle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require('esbuild')
88
entryPoints: ['src/extension.ts', 'src/language-server/main.ts'],
99
outdir: 'bundle',
1010
bundle: true,
11-
external: ['vscode'],
11+
external: ['vscode', '@prisma/*'],
1212
platform: 'node',
1313
sourcemap: !minify,
1414
watch: watch

packages/sdk/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"ts-morph": "^16.0.0"
3030
},
3131
"devDependencies": {
32+
"@types/node": "^18.0.0",
3233
"@types/semver": "^7.3.13",
3334
"copyfiles": "^2.4.1",
3435
"rimraf": "^3.0.2",

packages/sdk/src/prisma.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
/* eslint-disable @typescript-eslint/no-var-requires */
2+
13
import type { DMMF } from '@prisma/generator-helper';
2-
import { getDMMF as getDMMF4 } from '@prisma/internals';
3-
import { getDMMF as getDMMF5 } from '@prisma/internals-v5';
44
import { getPrismaVersion } from '@zenstackhq/runtime';
55
import path from 'path';
66
import * as semver from 'semver';
@@ -84,8 +84,10 @@ export type GetDMMFOptions = {
8484
export function getDMMF(options: GetDMMFOptions): Promise<DMMF.Document> {
8585
const prismaVersion = getPrismaVersion();
8686
if (prismaVersion && semver.gte(prismaVersion, '5.0.0')) {
87-
return getDMMF5(options);
87+
const _getDMMF = require('@prisma/internals-v5').getDMMF;
88+
return _getDMMF(options);
8889
} else {
89-
return getDMMF4(options);
90+
const _getDMMF = require('@prisma/internals').getDMMF;
91+
return _getDMMF(options);
9092
}
9193
}

pnpm-lock.yaml

Lines changed: 7 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)