Skip to content

Commit 7a9be9a

Browse files
committed
Merge remote-tracking branch 'origin/dev' into chore/prisma-6.2
2 parents abc620b + 81dd5b9 commit 7a9be9a

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

packages/ide/jetbrains/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## [Unreleased]
44

5+
### Added
6+
7+
- Field encryption attribute `@encrypted`.
8+
9+
## 2.9.3
10+
511
### Fixed
612

713
- Proper semantic highlighting and formatting for type declarations.

packages/schema/build/bundle.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@ require('esbuild')
1111
external: ['vscode', '@prisma/*'],
1212
platform: 'node',
1313
sourcemap: !minify,
14-
watch: watch
15-
? {
16-
onRebuild(error) {
17-
if (error) console.error('Watch build failed');
18-
else console.log(success);
19-
},
20-
}
21-
: false,
2214
minify,
2315
})
2416
.then(() => {

0 commit comments

Comments
 (0)