fix: vscode language accidentally bundles prisma packages (zenstackhq…

…#623)
Eventiva · Aug 12, 2023 · a81913e · a81913e
1 parent 3e09a3a
commit a81913e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 44 deletions.
diff --git a/packages/schema/build/bundle.js b/packages/schema/build/bundle.js
@@ -8,7 +8,7 @@ require('esbuild')
         entryPoints: ['src/extension.ts', 'src/language-server/main.ts'],
         outdir: 'bundle',
         bundle: true,
-        external: ['vscode'],
+        external: ['vscode', '@prisma/*'],
         platform: 'node',
         sourcemap: !minify,
         watch: watch

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -29,6 +29,7 @@
         "ts-morph": "^16.0.0"
     },
     "devDependencies": {
+        "@types/node": "^18.0.0",
         "@types/semver": "^7.3.13",
         "copyfiles": "^2.4.1",
         "rimraf": "^3.0.2",

diff --git a/packages/sdk/src/prisma.ts b/packages/sdk/src/prisma.ts
@@ -1,6 +1,6 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+
 import type { DMMF } from '@prisma/generator-helper';
-import { getDMMF as getDMMF4 } from '@prisma/internals';
-import { getDMMF as getDMMF5 } from '@prisma/internals-v5';
 import { getPrismaVersion } from '@zenstackhq/runtime';
 import path from 'path';
 import * as semver from 'semver';
@@ -84,8 +84,10 @@ export type GetDMMFOptions = {
 export function getDMMF(options: GetDMMFOptions): Promise<DMMF.Document> {
     const prismaVersion = getPrismaVersion();
     if (prismaVersion && semver.gte(prismaVersion, '5.0.0')) {
-        return getDMMF5(options);
+        const _getDMMF = require('@prisma/internals-v5').getDMMF;
+        return _getDMMF(options);
     } else {
-        return getDMMF4(options);
+        const _getDMMF = require('@prisma/internals').getDMMF;
+        return _getDMMF(options);
     }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml