ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix azdata API check when webpacked (#16505)

Browse Source
This commit is contained in:
Charles Gagnon
2021-07-30 16:06:50 -07:00
committed by GitHub
parent 3362462142
commit a7c1bcaf93
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/data-workspace/src/common/utils.ts
View File

@@ -54,6 +54,10 @@ export function getPackageInfo(packageJson: any): IPackageInfo | undefined {
let azdataApi: typeof azdataType | undefined = undefined; let azdataApi: typeof azdataType | undefined = undefined;
try { try {
azdataApi = require('azdata'); azdataApi = require('azdata');
if (!azdataApi?.version) {
// webpacking makes the require return an empty object instead of throwing an error so make sure we clear the var
azdataApi = undefined;
}
} catch { } catch {
// no-op // no-op
} }

4
extensions/sql-database-projects/src/common/utils.ts
View File

@@ -367,6 +367,10 @@ export function timeConversion(duration: number): string {
let azdataApi: typeof azdataType | undefined = undefined; let azdataApi: typeof azdataType | undefined = undefined;
try { try {
azdataApi = require('azdata'); azdataApi = require('azdata');
if (!azdataApi?.version) {
// webpacking makes the require return an empty object instead of throwing an error so make sure we clear the var
azdataApi = undefined;
}
} catch { } catch {
// no-op // no-op
} }