From 3ee83166df344f0e0557df034897fae838d95631 Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Mon, 2 Feb 2026 11:27:14 -0500 Subject: [PATCH] Fix telemetry bundling issue --- esbuild.mjs | 8 ++-- package-lock.json | 115 +++++++++++++++++++++++----------------------- package.json | 6 +-- 3 files changed, 65 insertions(+), 64 deletions(-) diff --git a/esbuild.mjs b/esbuild.mjs index 8de74253..1d7ff88f 100644 --- a/esbuild.mjs +++ b/esbuild.mjs @@ -5,13 +5,13 @@ import { autoEsbuildOrWatch, autoSelectEsbuildConfig } from '@microsoft/vscode-azext-eng/esbuild'; -const baseConfig = autoSelectEsbuildConfig(); +const { extensionConfig, telemetryConfig } = autoSelectEsbuildConfig(); /** @type {import('esbuild').BuildOptions} */ const finalConfig = { - ...baseConfig, + ...extensionConfig, entryPoints: [ - ...baseConfig.entryPoints, + ...extensionConfig.entryPoints, { in: './node_modules/dockerfile-language-server-nodejs/lib/server.js', out: 'dockerfile-language-server-nodejs/lib/server', @@ -23,4 +23,4 @@ const finalConfig = { ], }; -await autoEsbuildOrWatch(finalConfig); +await autoEsbuildOrWatch({ extensionConfig: finalConfig, telemetryConfig }); diff --git a/package-lock.json b/package-lock.json index b206e797..4cd3e0e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-containers", - "version": "2.4.5-alpha", + "version": "2.4.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vscode-containers", - "version": "2.4.5-alpha", + "version": "2.4.1", "license": "SEE LICENSE IN LICENSE.md", "dependencies": { "@azure/arm-authorization": "^9.0.0", @@ -16,7 +16,7 @@ "@microsoft/vscode-azext-azureappservice": "^4.0.0", "@microsoft/vscode-azext-azureauth": "6.0.0-alpha.1", "@microsoft/vscode-azext-azureutils": "^4.0.0", - "@microsoft/vscode-azext-utils": "^4.0.0", + "@microsoft/vscode-azext-utils": "^4.0.4", "@microsoft/vscode-container-client": "^0.5.2", "@microsoft/vscode-docker-registries": "^0.4.1", "@microsoft/vscode-processutils": "^0.2.1", @@ -34,7 +34,7 @@ }, "devDependencies": { "@azure/arm-appservice": "^15.0.0", - "@microsoft/vscode-azext-eng": "1.0.0-alpha.8", + "@microsoft/vscode-azext-eng": "1.0.0-alpha.11", "@types/fs-extra": "^11.0.1", "@types/node": "22.x", "@types/semver": "^7.3.13", @@ -1357,12 +1357,12 @@ "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==" }, "node_modules/@microsoft/1ds-core-js": { - "version": "4.3.10", - "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.10.tgz", - "integrity": "sha512-5fSZmkGwWkH+mrIA5M1GYPZdPM+SjXwCCl2Am7VhFoVwOBJNhRnwvIpAdzw6sFjiebN/rz+/YH0NdxztGZSa9Q==", + "version": "4.3.11", + "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.11.tgz", + "integrity": "sha512-QyQE/YzFYB+31WEpX9hvDoXZOIXA7308Z5uuL1mSsyDSkNPl24hBWz9O3vZL+/p9shy756eKLI2nFLwwIAhXyw==", "license": "MIT", "dependencies": { - "@microsoft/applicationinsights-core-js": "3.3.10", + "@microsoft/applicationinsights-core-js": "3.3.11", "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/ts-async": ">= 0.5.4 < 2.x", @@ -1370,12 +1370,12 @@ } }, "node_modules/@microsoft/1ds-post-js": { - "version": "4.3.10", - "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.10.tgz", - "integrity": "sha512-VSLjc9cT+Y+eTiSfYltJHJCejn8oYr0E6Pq2BMhOEO7F6IyLGYIxzKKvo78ze9x+iHX7KPTATcZ+PFgjGXuNqg==", + "version": "4.3.11", + "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.11.tgz", + "integrity": "sha512-V0ZeeALy/Pj8HWgNHDsK+yDeCYnJ9bCgTWhcrna/ZiAT+sGfWs6mDBjAVcG03uP7TDjdWLf8w79lgbXJ3+s3DA==", "license": "MIT", "dependencies": { - "@microsoft/1ds-core-js": "4.3.10", + "@microsoft/1ds-core-js": "4.3.11", "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/ts-async": ">= 0.5.4 < 2.x", @@ -1383,13 +1383,13 @@ } }, "node_modules/@microsoft/applicationinsights-channel-js": { - "version": "3.3.10", - "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.10.tgz", - "integrity": "sha512-iolFLz1ocWAzIQqHIEjjov3gNTPkgFQ4ArHnBcJEYoffOGWlJt6copaevS5YPI5rHzmbySsengZ8cLJJBBrXzQ==", + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.11.tgz", + "integrity": "sha512-0ex/mxTf5R+P5WSvdU8Hgbeg8VzQ0XvcnjKQdmQy05ycScnKevt8an3DEPikOFqOKDi59L5hUETZlcdhesnVtg==", "license": "MIT", "dependencies": { - "@microsoft/applicationinsights-common": "3.3.10", - "@microsoft/applicationinsights-core-js": "3.3.10", + "@microsoft/applicationinsights-common": "3.3.11", + "@microsoft/applicationinsights-core-js": "3.3.11", "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/ts-async": ">= 0.5.4 < 2.x", @@ -1400,12 +1400,12 @@ } }, "node_modules/@microsoft/applicationinsights-common": { - "version": "3.3.10", - "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.10.tgz", - "integrity": "sha512-RVIenPIvNgZCbjJdALvLM4rNHgAFuHI7faFzHCgnI6S2WCUNGHeXlQTs9EUUrL+n2TPp9/cd0KKMILU5VVyYiA==", + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.11.tgz", + "integrity": "sha512-OIe5vL56lkmIsRsI21QqbGpF8gF/UzUP4mlEhGWyG2UMskdtWrY+c+xAynyNDsAjhKKge+Rrs/xkpC0Fo0QrhQ==", "license": "MIT", "dependencies": { - "@microsoft/applicationinsights-core-js": "3.3.10", + "@microsoft/applicationinsights-core-js": "3.3.11", "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/ts-utils": ">= 0.11.8 < 2.x" @@ -1415,9 +1415,9 @@ } }, "node_modules/@microsoft/applicationinsights-core-js": { - "version": "3.3.10", - "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.10.tgz", - "integrity": "sha512-5yKeyassZTq2l+SAO4npu6LPnbS++UD+M+Ghjm9uRzoBwD8tumFx0/F8AkSVqbniSREd+ztH/2q2foewa2RZyg==", + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.11.tgz", + "integrity": "sha512-WlBY1sKDNL62T++NifgFCyDuOoNUNrVILfnHubOzgU/od7MFEQYWU8EZyDcBC/+Z8e3TD6jfixurYtWoUC+6Eg==", "license": "MIT", "dependencies": { "@microsoft/applicationinsights-shims": "3.0.1", @@ -1439,14 +1439,14 @@ } }, "node_modules/@microsoft/applicationinsights-web-basic": { - "version": "3.3.10", - "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.10.tgz", - "integrity": "sha512-AZib5DAT3NU0VT0nLWEwXrnoMDDgZ/5S4dso01CNU5ELNxLdg+1fvchstlVdMy4FrAnxzs8Wf/GIQNFYOVgpAw==", + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.11.tgz", + "integrity": "sha512-pdxXWT0khRDSubK66ZhVG2DXkJwtqyrcil+iDD2pVaZP+fFHXunJI6/MhEdjgk6j3jpASt8SSq9xWVYOqrBbpA==", "license": "MIT", "dependencies": { - "@microsoft/applicationinsights-channel-js": "3.3.10", - "@microsoft/applicationinsights-common": "3.3.10", - "@microsoft/applicationinsights-core-js": "3.3.10", + "@microsoft/applicationinsights-channel-js": "3.3.11", + "@microsoft/applicationinsights-common": "3.3.11", + "@microsoft/applicationinsights-core-js": "3.3.11", "@microsoft/applicationinsights-shims": "3.0.1", "@microsoft/dynamicproto-js": "^2.0.3", "@nevware21/ts-async": ">= 0.5.4 < 2.x", @@ -1592,12 +1592,13 @@ } }, "node_modules/@microsoft/vscode-azext-eng": { - "version": "1.0.0-alpha.8", - "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-eng/-/vscode-azext-eng-1.0.0-alpha.8.tgz", - "integrity": "sha512-pFDrDrFG/Y335Dw8gbBYJ8RtiVWDYBkSEsxvj2jBX3wyec5tjtsNyel3RrBg2Cr7Ut1vTpF9ZQuyg480lJuOmA==", + "version": "1.0.0-alpha.11", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-eng/-/vscode-azext-eng-1.0.0-alpha.11.tgz", + "integrity": "sha512-BIZueLcw8pQYOx8k5ZEKfn8ScH7+Cgz93sFZX9jfigj3OucpH+j6Txg7byU/Bq3n3oRWWBCD6osmz4A+jGYFwA==", "dev": true, "license": "MIT", "dependencies": { + "@tony.ganchev/eslint-plugin-header": "^3.2.0", "@types/chai": "^5.2.3", "@types/chai-as-promised": "^8.0.2", "@types/mocha": "^10.0.10", @@ -1648,15 +1649,14 @@ } }, "node_modules/@microsoft/vscode-azext-utils": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-4.0.0.tgz", - "integrity": "sha512-c5e4LD8Xkir6KqAVzIF0f+u1w/QDH7b3AFgYYcWqPyYN0HVp+YCvI97zP1uqb/YzZFTYjr2NbO54xgtftsePAA==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@microsoft/vscode-azext-utils/-/vscode-azext-utils-4.0.4.tgz", + "integrity": "sha512-E0SRsJKHIfbjh7O8gZegd6PO4/1enU9DiI7owjkoxYLQoZJTCbVa9/seEcwsppi87yzKfuPJBHh7ed0PJ8OQAA==", "license": "MIT", "dependencies": { "@microsoft/vscode-azureresources-api": "^3.0.0", - "@vscode/extension-telemetry": "^0.9.6", + "@vscode/extension-telemetry": "^1.4.0", "dayjs": "^1.11.2", - "escape-string-regexp": "^2.0.0", "html-to-text": "^9.0.0", "semver": "^7.3.7", "vscode-tas-client": "^0.1.84" @@ -1744,12 +1744,12 @@ } }, "node_modules/@nevware21/ts-async": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz", - "integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.5.tgz", + "integrity": "sha512-vwqaL05iJPjLeh5igPi8MeeAu10i+Aq7xko1fbo9F5Si6MnVN5505qaV7AhSdk5MCBJVT/UYMk3kgInNjDb4Ig==", "license": "MIT", "dependencies": { - "@nevware21/ts-utils": ">= 0.11.6 < 2.x" + "@nevware21/ts-utils": ">= 0.12.2 < 2.x" } }, "node_modules/@nevware21/ts-utils": { @@ -2292,6 +2292,16 @@ "@textlint/ast-node-types": "15.4.1" } }, + "node_modules/@tony.ganchev/eslint-plugin-header": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@tony.ganchev/eslint-plugin-header/-/eslint-plugin-header-3.2.0.tgz", + "integrity": "sha512-/Ke4Yht9x9YmFpdts6KAG0d/rxMnktSHTKtX0wBNz0A3ZdEiOSE7rrK3F6MpMB8fjQXdm3xD/mN1plyFGF3OJA==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "eslint": ">=7.7.0" + } + }, "node_modules/@types/chai": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz", @@ -2671,14 +2681,14 @@ } }, "node_modules/@vscode/extension-telemetry": { - "version": "0.9.9", - "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.9.tgz", - "integrity": "sha512-WG/H+H/JRMPnpbXMufXgXlaeJwKszXfAanOERV/nkXBbYyNw0KR84JjUjSg+TgkzYEF/ttRoHTP6fFZWkXdoDQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-1.4.0.tgz", + "integrity": "sha512-mqypuqIDn+vQnaQ8tMdvCRn9BprZTH2j6nlFFv9hE6hB25n32F8rOZinos8OgblRi87X1qdBpjpb0Em1LGSG9w==", "license": "MIT", "dependencies": { - "@microsoft/1ds-core-js": "^4.3.4", - "@microsoft/1ds-post-js": "^4.3.4", - "@microsoft/applicationinsights-web-basic": "^3.3.4" + "@microsoft/1ds-core-js": "^4.3.10", + "@microsoft/1ds-post-js": "^4.3.10", + "@microsoft/applicationinsights-web-basic": "^3.3.10" }, "engines": { "vscode": "^1.75.0" @@ -4554,15 +4564,6 @@ "node": ">=6" } }, - "node_modules/escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/eslint": { "version": "9.39.1", "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.1.tgz", diff --git a/package.json b/package.json index f3c7f232..2c207c1a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vscode-containers", - "version": "2.4.5-alpha", + "version": "2.4.1", "publisher": "ms-azuretools", "displayName": "Container Tools", "description": "Makes it easy to create, manage, and debug containerized applications.", @@ -3351,7 +3351,7 @@ ], "devDependencies": { "@azure/arm-appservice": "^15.0.0", - "@microsoft/vscode-azext-eng": "1.0.0-alpha.8", + "@microsoft/vscode-azext-eng": "1.0.0-alpha.11", "@types/fs-extra": "^11.0.1", "@types/node": "22.x", "@types/semver": "^7.3.13", @@ -3371,7 +3371,7 @@ "@microsoft/vscode-azext-azureappservice": "^4.0.0", "@microsoft/vscode-azext-azureauth": "6.0.0-alpha.1", "@microsoft/vscode-azext-azureutils": "^4.0.0", - "@microsoft/vscode-azext-utils": "^4.0.0", + "@microsoft/vscode-azext-utils": "^4.0.4", "@microsoft/vscode-container-client": "^0.5.2", "@microsoft/vscode-docker-registries": "^0.4.1", "@microsoft/vscode-processutils": "^0.2.1",