Skip to content

Commit 41d3eac

Browse files
aeschliaeschli
authored
Merge pull request microsoft#20970 from Microsoft/kieferrm/jsonTelemetryUpgrade
upgrade telemetry package used by json and html extensions
2 parents 9be23e7 + ccefc77 commit 41d3eac

8 files changed

Lines changed: 23 additions & 33 deletions

File tree

‎extensions/html/client/src/htmlMain.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export function activate(context: ExtensionContext) {
2929

3030
let packageInfo = getPackageInfo(context);
3131
let telemetryReporter: TelemetryReporter = packageInfo && new TelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey);
32+
context.subscriptions.push(telemetryReporter);
3233

3334
// The server is implemented in node
3435
let serverModule = context.asAbsolutePath(path.join('server', 'out', 'htmlServerMain.js'));

‎extensions/html/client/src/typings/vscode-extension-telemetry.d.ts‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎extensions/html/npm-shrinkwrap.json‎

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

‎extensions/html/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
}
190190
},
191191
"dependencies": {
192-
"vscode-extension-telemetry": "0.0.5",
192+
"vscode-extension-telemetry": "^0.0.6",
193193
"vscode-languageclient": "^3.1.0-alpha.1",
194194
"vscode-languageserver-types": "^3.0.3",
195195
"vscode-nls": "^2.0.2"

‎extensions/json/client/src/jsonMain.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ export function activate(context: ExtensionContext) {
3535

3636
let packageInfo = getPackageInfo(context);
3737
let telemetryReporter: TelemetryReporter = packageInfo && new TelemetryReporter(packageInfo.name, packageInfo.version, packageInfo.aiKey);
38+
context.subscriptions.push(telemetryReporter);
3839

3940
// The server is implemented in node
4041
let serverModule = context.asAbsolutePath(path.join('server', 'out', 'jsonServerMain.js'));
@@ -99,7 +100,7 @@ function getSchemaAssociation(context: ExtensionContext): ISchemaAssociations {
99100
let jsonValidation = packageJSON.contributes.jsonValidation;
100101
if (Array.isArray(jsonValidation)) {
101102
jsonValidation.forEach(jv => {
102-
let {fileMatch, url} = jv;
103+
let { fileMatch, url } = jv;
103104
if (fileMatch && url) {
104105
if (url[0] === '.' && url[1] === '/') {
105106
url = Uri.file(path.join(extension.extensionPath, url)).toString();

‎extensions/json/client/src/typings/vscode-extension-telemetry.d.ts‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎extensions/json/npm-shrinkwrap.json‎

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

‎extensions/json/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
}
113113
},
114114
"dependencies": {
115-
"vscode-extension-telemetry": "^0.0.5",
115+
"vscode-extension-telemetry": "^0.0.6",
116116
"vscode-languageclient": "^3.1.0-alpha.1",
117117
"vscode-nls": "^2.0.2"
118118
},

0 commit comments

Comments
 (0)