mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-27 12:04:04 +01:00
12326f9906
* chore: bump electron@35.0.1 * chore: update types/node@22.x * chore: update web types for node v22.x * chore: bump electron@35.1.2 * chore: update node.js build * chore: update app.dock usage Refs71f3ff6bf2* chore: bump electron@35.1.4 * chore: bump electron@35.1.5 * ci: bump sysroot to glibc 2.28 and gcc 10.5.0 * ci: enable timeout for smoketests * chore: bump min glibcxx to 3.4.26 for server * Revert "ci: enable timeout for smoketests" This reverts commitafb637e85d. * chore: update debian dependencies * fix: workaround npm.ps1 argument parsing with powershell * chore: update rpm dependencies * test: partially revert changes from 242535 * test: remove redudant keybinding dispatch for selectTab * test: fix test failure from running configured tasks * test: focus settings editor for preferences.test.ts * node - adopt compile cache (#246835) * node - adopt compile cache * adopt for utility process * tweaks * log state of compilation cache * Revert "log state of compilation cache" This reverts commit f3840387a583013834762e2c44f6e8424929297f. * Revert "node - adopt compile cache (#246835)" This reverts commit 673a00cab66c9bac87f3cd27b80efa41c80150f1. * chore: update builds * chore: bump electron@35.2.0 * chore: bump electron@35.2.1 * chore: bump electron@35.2.2 --------- Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
178 lines
7.2 KiB
JSON
178 lines
7.2 KiB
JSON
{
|
|
"name": "merge-conflict",
|
|
"version": "1.0.0",
|
|
"lockfileVersion": 3,
|
|
"requires": true,
|
|
"packages": {
|
|
"": {
|
|
"name": "merge-conflict",
|
|
"version": "1.0.0",
|
|
"license": "MIT",
|
|
"dependencies": {
|
|
"@vscode/extension-telemetry": "^0.9.8"
|
|
},
|
|
"devDependencies": {
|
|
"@types/node": "22.x"
|
|
},
|
|
"engines": {
|
|
"vscode": "^1.5.0"
|
|
}
|
|
},
|
|
"node_modules/@microsoft/1ds-core-js": {
|
|
"version": "4.3.4",
|
|
"resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
|
|
"integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
|
|
"license": "MIT",
|
|
"dependencies": {
|
|
"@microsoft/applicationinsights-core-js": "3.3.4",
|
|
"@microsoft/applicationinsights-shims": "3.0.1",
|
|
"@microsoft/dynamicproto-js": "^2.0.3",
|
|
"@nevware21/ts-async": ">= 0.5.2 < 2.x",
|
|
"@nevware21/ts-utils": ">= 0.11.3 < 2.x"
|
|
}
|
|
},
|
|
"node_modules/@microsoft/1ds-post-js": {
|
|
"version": "4.3.4",
|
|
"resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
|
|
"integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
|
|
"license": "MIT",
|
|
"dependencies": {
|
|
"@microsoft/1ds-core-js": "4.3.4",
|
|
"@microsoft/applicationinsights-shims": "3.0.1",
|
|
"@microsoft/dynamicproto-js": "^2.0.3",
|
|
"@nevware21/ts-async": ">= 0.5.2 < 2.x",
|
|
"@nevware21/ts-utils": ">= 0.11.3 < 2.x"
|
|
}
|
|
},
|
|
"node_modules/@microsoft/applicationinsights-channel-js": {
|
|
"version": "3.3.4",
|
|
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
|
|
"integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
|
|
"license": "MIT",
|
|
"dependencies": {
|
|
"@microsoft/applicationinsights-common": "3.3.4",
|
|
"@microsoft/applicationinsights-core-js": "3.3.4",
|
|
"@microsoft/applicationinsights-shims": "3.0.1",
|
|
"@microsoft/dynamicproto-js": "^2.0.3",
|
|
"@nevware21/ts-async": ">= 0.5.2 < 2.x",
|
|
"@nevware21/ts-utils": ">= 0.11.3 < 2.x"
|
|
},
|
|
"peerDependencies": {
|
|
"tslib": ">= 1.0.0"
|
|
}
|
|
},
|
|
"node_modules/@microsoft/applicationinsights-common": {
|
|
"version": "3.3.4",
|
|
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
|
|
"integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
|
|
"license": "MIT",
|
|
"dependencies": {
|
|
"@microsoft/applicationinsights-core-js": "3.3.4",
|
|
"@microsoft/applicationinsights-shims": "3.0.1",
|
|
"@microsoft/dynamicproto-js": "^2.0.3",
|
|
"@nevware21/ts-utils": ">= 0.11.3 < 2.x"
|
|
},
|
|
"peerDependencies": {
|
|
"tslib": ">= 1.0.0"
|
|
}
|
|
},
|
|
"node_modules/@microsoft/applicationinsights-core-js": {
|
|
"version": "3.3.4",
|
|
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
|
|
"integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
|
|
"license": "MIT",
|
|
"dependencies": {
|
|
"@microsoft/applicationinsights-shims": "3.0.1",
|
|
"@microsoft/dynamicproto-js": "^2.0.3",
|
|
"@nevware21/ts-async": ">= 0.5.2 < 2.x",
|
|
"@nevware21/ts-utils": ">= 0.11.3 < 2.x"
|
|
},
|
|
"peerDependencies": {
|
|
"tslib": ">= 1.0.0"
|
|
}
|
|
},
|
|
"node_modules/@microsoft/applicationinsights-shims": {
|
|
"version": "3.0.1",
|
|
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
|
|
"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
|
|
"license": "MIT",
|
|
"dependencies": {
|
|
"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
|
|
}
|
|
},
|
|
"node_modules/@microsoft/applicationinsights-web-basic": {
|
|
"version": "3.3.4",
|
|
"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
|
|
"integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
|
|
"license": "MIT",
|
|
"dependencies": {
|
|
"@microsoft/applicationinsights-channel-js": "3.3.4",
|
|
"@microsoft/applicationinsights-common": "3.3.4",
|
|
"@microsoft/applicationinsights-core-js": "3.3.4",
|
|
"@microsoft/applicationinsights-shims": "3.0.1",
|
|
"@microsoft/dynamicproto-js": "^2.0.3",
|
|
"@nevware21/ts-async": ">= 0.5.2 < 2.x",
|
|
"@nevware21/ts-utils": ">= 0.11.3 < 2.x"
|
|
},
|
|
"peerDependencies": {
|
|
"tslib": ">= 1.0.0"
|
|
}
|
|
},
|
|
"node_modules/@microsoft/dynamicproto-js": {
|
|
"version": "2.0.3",
|
|
"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
|
|
"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
|
|
"license": "MIT",
|
|
"dependencies": {
|
|
"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
|
|
}
|
|
},
|
|
"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==",
|
|
"license": "MIT",
|
|
"dependencies": {
|
|
"@nevware21/ts-utils": ">= 0.11.6 < 2.x"
|
|
}
|
|
},
|
|
"node_modules/@nevware21/ts-utils": {
|
|
"version": "0.11.6",
|
|
"resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
|
|
"integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
|
|
"license": "MIT"
|
|
},
|
|
"node_modules/@types/node": {
|
|
"version": "22.13.10",
|
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz",
|
|
"integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==",
|
|
"dev": true,
|
|
"license": "MIT",
|
|
"dependencies": {
|
|
"undici-types": "~6.20.0"
|
|
}
|
|
},
|
|
"node_modules/@vscode/extension-telemetry": {
|
|
"version": "0.9.8",
|
|
"resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
|
|
"integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
|
|
"license": "MIT",
|
|
"dependencies": {
|
|
"@microsoft/1ds-core-js": "^4.3.4",
|
|
"@microsoft/1ds-post-js": "^4.3.4",
|
|
"@microsoft/applicationinsights-web-basic": "^3.3.4"
|
|
},
|
|
"engines": {
|
|
"vscode": "^1.75.0"
|
|
}
|
|
},
|
|
"node_modules/undici-types": {
|
|
"version": "6.20.0",
|
|
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
|
|
"integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
|
|
"dev": true,
|
|
"license": "MIT"
|
|
}
|
|
}
|
|
}
|