Skip to content

Commit d95a513

Browse files
authored
Fix telemetry bundling...again... (#418)
1 parent 951efde commit d95a513

File tree

7 files changed

+392
-406
lines changed

7 files changed

+392
-406
lines changed

package-lock.json

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

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"onLanguage:dockerfile",
4040
"onLanguage:dockercompose"
4141
],
42+
"type": "module",
4243
"main": "main.mjs",
4344
"module": "main.mjs",
4445
"contributes": {
@@ -3353,7 +3354,7 @@
33533354
"devDependencies": {
33543355
"@azure/arm-appservice": "*",
33553356
"@azure/arm-authorization": "*",
3356-
"@microsoft/vscode-azext-eng": "1.0.0-alpha.12",
3357+
"@microsoft/vscode-azext-eng": "1.0.0-alpha.14",
33573358
"@types/fs-extra": "^11.0.1",
33583359
"@types/node": "22.x",
33593360
"@types/semver": "^7.3.13",

src/commands/registries/azure/openInAzurePortal.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License. See LICENSE.md in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { IActionContext, createSubscriptionContext } from '@microsoft/vscode-azext-utils';
6+
import { IActionContext, ISubscriptionContext, createSubscriptionContext } from '@microsoft/vscode-azext-utils';
77
import { isRepository } from '@microsoft/vscode-docker-registries';
88
import { ext } from '../../../extensionVariables';
99
import { AzureRegistry, AzureRepository, AzureSubscriptionRegistryItem, isAzureRegistry, isAzureSubscriptionRegistryItem } from '../../../tree/registries/Azure/AzureRegistryDataProvider';
@@ -21,7 +21,7 @@ export async function openInAzurePortal(context: IActionContext, node?: UnifiedR
2121

2222
const azureRegistryItem = node.wrappedItem;
2323
const azExtAzureUtils = await getAzExtAzureUtils();
24-
let subscriptionContext = undefined;
24+
let subscriptionContext: ISubscriptionContext | undefined;
2525
if (isAzureSubscriptionRegistryItem(azureRegistryItem)) {
2626
subscriptionContext = createSubscriptionContext(azureRegistryItem.subscription);
2727
await azExtAzureUtils.openInPortal(subscriptionContext, `/subscriptions/${subscriptionContext.subscriptionId}`);

src/commands/registries/logInToDockerCli.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export async function logInToDockerCli(context: IActionContext, node?: UnifiedRe
4949
// Temporary work-around for this error- same as Azure CLI
5050
// See https://github.com/Azure/azure-cli/issues/4843
5151
context.errorHandling.suppressReportIssue = true;
52-
throw new Error(vscode.l10n.t('In order to log in to the Docker CLI using tokens, you currently need to go to your Docker config file and remove `"credsStore": "wincred"`, then try again. \nDoing this will disable wincred and cause Docker to store credentials directly in the .docker/config.json file. All registries that are currently logged in will be logged out.'));
52+
throw new Error(vscode.l10n.t('In order to log in to the Docker CLI using tokens, you currently need to go to your Docker config file and remove `"credsStore": "wincred"`, then try again. \nDoing this will disable wincred and cause Docker to store credentials directly in the .docker/config.json file. All registries that are currently logged in will be logged out.'), { cause: err });
5353
} else {
5454
throw err;
5555
}

src/utils/httpRequest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export async function streamToFile(downloadUrl: string, fileName: string): Promi
153153
errorText = error.toString();
154154
}
155155

156-
throw new Error(`Failed to download ${downloadUrl}: ${errorText}`);
156+
throw new Error(`Failed to download ${downloadUrl}: ${errorText}`, { cause: error });
157157
}
158158
}
159159

src/utils/netCoreUtils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export async function getNetCoreProjectInfo(project: string, additionalPropertie
8787
}
8888
} catch (err) {
8989
const error = parseError(err);
90-
throw new Error(vscode.l10n.t('Unable to determine project information for project \'{0}\': {1}', project, error.message));
90+
throw new Error(vscode.l10n.t('Unable to determine project information for project \'{0}\': {1}', project, error.message), { cause: err });
9191
}
9292
}
9393

@@ -123,6 +123,6 @@ export async function getBlazorManifestInfo(project: string): Promise<BlazorMani
123123
};
124124
} catch (err) {
125125
const error = parseError(err);
126-
throw new Error(vscode.l10n.t('Unable to determine Blazor project information for project \'{0}\': {1}', project, error.message));
126+
throw new Error(vscode.l10n.t('Unable to determine Blazor project information for project \'{0}\': {1}', project, error.message), { cause: err });
127127
}
128128
}

tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"compilerOptions": {
3-
"module": "nodenext",
4-
"moduleResolution": "nodenext",
3+
"module": "es2022",
4+
"moduleResolution": "bundler",
55
"target": "es2022",
66
"outDir": "out",
77
"lib": [

0 commit comments

Comments
 (0)