Skip to content

Commit 4c358e0

Browse files
meganroggemeganrogge
authored
Merge branch 'main' into terminal-tab-defaults
2 parents 2d9947b + a20329d commit 4c358e0

File tree

66 files changed

+1246
-294
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1246
-294
lines changed

‎build/azure-pipelines/darwin/product-build-darwin-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ steps:
4646
compile-extension:html-language-features-server \
4747
compile-extension:ipynb \
4848
compile-extension:json-language-features-server \
49+
compile-extension:markdown-language-features-server \
4950
compile-extension:markdown-language-features \
5051
compile-extension-media \
5152
compile-extension:microsoft-authentication \

‎build/azure-pipelines/linux/product-build-linux-client-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ steps:
5858
compile-extension:html-language-features-server \
5959
compile-extension:ipynb \
6060
compile-extension:json-language-features-server \
61+
compile-extension:markdown-language-features-server \
6162
compile-extension:markdown-language-features \
6263
compile-extension-media \
6364
compile-extension:microsoft-authentication \

‎build/azure-pipelines/win32/product-build-win32-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ steps:
5252
compile-extension:html-language-features-server `
5353
compile-extension:ipynb `
5454
compile-extension:json-language-features-server `
55+
compile-extension:markdown-language-features-server `
5556
compile-extension:markdown-language-features `
5657
compile-extension-media `
5758
compile-extension:microsoft-authentication `

‎build/gulpfile.extensions.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ const compilations = [
5353
'json-language-features/client/tsconfig.json',
5454
'json-language-features/server/tsconfig.json',
5555
'markdown-language-features/preview-src/tsconfig.json',
56+
'markdown-language-features/server/tsconfig.json',
5657
'markdown-language-features/tsconfig.json',
5758
'markdown-math/tsconfig.json',
5859
'merge-conflict/tsconfig.json',

‎build/npm/dirs.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ exports.dirs = [
2828
'extensions/jake',
2929
'extensions/json-language-features',
3030
'extensions/json-language-features/server',
31+
'extensions/markdown-language-features/server',
3132
'extensions/markdown-language-features',
3233
'extensions/markdown-math',
3334
'extensions/merge-conflict',

‎extensions/git/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"engines": {
99
"vscode": "^1.5.0"
1010
},
11-
"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
11+
"aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
1212
"enabledApiProposals": [
1313
"diffCommand",
1414
"contribMergeEditorToolbar",
@@ -2712,7 +2712,7 @@
27122712
},
27132713
"dependencies": {
27142714
"@joaomoreno/unique-names-generator": "5.0.0",
2715-
"@vscode/extension-telemetry": "0.6.1",
2715+
"@vscode/extension-telemetry": "0.6.2",
27162716
"@vscode/iconv-lite-umd": "0.7.0",
27172717
"byline": "^5.0.0",
27182718
"file-type": "^7.2.0",

‎extensions/git/yarn.lock

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,42 @@
77
resolved "https://registry.yarnpkg.com/@joaomoreno/unique-names-generator/-/unique-names-generator-5.0.0.tgz#a67fe66e3d825c929fc97abfdf17fd80a72beab0"
88
integrity sha512-3kP6z7aoGEoM3tvhTBZioYa1QFkovOU8uxAlVclnZlXivwF/WTE5EcOzvoDdM+jtjJyWvCMDR1Q4RBjDqupD3A==
99

10+
"@microsoft/[email protected]", "@microsoft/1ds-core-js@^3.2.3":
11+
version "3.2.3"
12+
resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.3.tgz#2217d92ec8b073caa4577a13f40ea3a5c4c4d4e7"
13+
integrity sha512-796A8fd90oUKDRO7UXUT9BwZ3G+a9XzJj5v012FcCN/2qRhEsIV3x/0wkx2S08T4FiQEUPkB2uoYHpEjEneM7g==
14+
dependencies:
15+
"@microsoft/applicationinsights-core-js" "2.8.4"
16+
"@microsoft/applicationinsights-shims" "^2.0.1"
17+
"@microsoft/dynamicproto-js" "^1.1.6"
18+
19+
"@microsoft/1ds-post-js@^3.2.3":
20+
version "3.2.3"
21+
resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.3.tgz#1fa7d51615a44f289632ae8c588007ba943db216"
22+
integrity sha512-tcGJQXXr2LYoBbIXPoUVe1KCF3OtBsuKDFL7BXfmNtuSGtWF0yejm6H83DrR8/cUIGMRMUP9lqNlqFGwDYiwAQ==
23+
dependencies:
24+
"@microsoft/1ds-core-js" "3.2.3"
25+
"@microsoft/applicationinsights-shims" "^2.0.1"
26+
"@microsoft/dynamicproto-js" "^1.1.6"
27+
28+
"@microsoft/[email protected]":
29+
version "2.8.4"
30+
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.4.tgz#607e531bb241a8920d43960f68a7c76a6f9af596"
31+
integrity sha512-FoA0FNOsFbJnLyTyQlYs6+HR7HMEa6nAOE6WOm9WVejBHMHQ/Bdb+hfVFi6slxwCimr/ner90jchi4/sIYdnyQ==
32+
dependencies:
33+
"@microsoft/applicationinsights-shims" "2.0.1"
34+
"@microsoft/dynamicproto-js" "^1.1.6"
35+
36+
"@microsoft/[email protected]", "@microsoft/applicationinsights-shims@^2.0.1":
37+
version "2.0.1"
38+
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.1.tgz#5d72fb7aaf4056c4fda54f9d7c93ccf8ca9bcbfd"
39+
integrity sha512-G0MXf6R6HndRbDy9BbEj0zrLeuhwt2nsXk2zKtF0TnYo39KgYqhYC2ayIzKPTm2KAE+xzD7rgyLdZnrcRvt9WQ==
40+
41+
"@microsoft/dynamicproto-js@^1.1.6":
42+
version "1.1.6"
43+
resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.6.tgz#6fe03468862861f5f88ac4c3959a652b3797f1bc"
44+
integrity sha512-D1Oivw1A4bIXhzBIy3/BBPn3p2On+kpO2NiYt9shICDK7L/w+cR6FFBUsBZ05l6iqzTeL+Jm8lAYn0g6G7DmDg==
45+
1046
"@types/[email protected]":
1147
version "4.2.31"
1248
resolved "https://registry.yarnpkg.com/@types/byline/-/byline-4.2.31.tgz#0e61fcb9c03e047d21c4496554c7116297ab60cd"
@@ -46,10 +82,13 @@
4682
resolved "https://registry.yarnpkg.com/@types/which/-/which-1.0.28.tgz#016e387629b8817bed653fe32eab5d11279c8df6"
4783
integrity sha1-AW44dim4gXvtZT/jLqtdESecjfY=
4884

49-
"@vscode/[email protected]":
50-
version "0.6.1"
51-
resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.6.1.tgz#f8d1f7145baf932b75077c48107edff48501fc14"
52-
integrity sha512-Y4Oc8yGURGVF4WhCZcu+EVy+MAIeQDLDVeDlLn59H0C1w+7xr8dL2ZtDBioy+Hog1Edrd6zOwr3Na7xe1iC/UA==
85+
"@vscode/[email protected]":
86+
version "0.6.2"
87+
resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.6.2.tgz#b86814ee680615730da94220c2b03ea9c3c14a8e"
88+
integrity sha512-yb/wxLuaaCRcBAZtDCjNYSisAXz3FWsSqAha5nhHcYxx2ZPdQdWuZqVXGKq0ZpHVndBWWtK6XqtpCN2/HB4S1w==
89+
dependencies:
90+
"@microsoft/1ds-core-js" "^3.2.3"
91+
"@microsoft/1ds-post-js" "^3.2.3"
5392

5493
"@vscode/[email protected]":
5594
version "0.7.0"

‎extensions/github-authentication/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
}
4949
}
5050
},
51-
"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
51+
"aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
5252
"main": "./out/extension.js",
5353
"browser": "./dist/browser/extension.js",
5454
"scripts": {
@@ -61,7 +61,7 @@
6161
"dependencies": {
6262
"node-fetch": "2.6.7",
6363
"uuid": "8.1.0",
64-
"@vscode/extension-telemetry": "0.6.1",
64+
"@vscode/extension-telemetry": "0.6.2",
6565
"vscode-nls": "^5.0.0",
6666
"vscode-tas-client": "^0.1.47"
6767
},

‎extensions/github-authentication/yarn.lock

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,42 @@
22
# yarn lockfile v1
33

44

5+
"@microsoft/[email protected]", "@microsoft/1ds-core-js@^3.2.3":
6+
version "3.2.3"
7+
resolved "https://registry.yarnpkg.com/@microsoft/1ds-core-js/-/1ds-core-js-3.2.3.tgz#2217d92ec8b073caa4577a13f40ea3a5c4c4d4e7"
8+
integrity sha512-796A8fd90oUKDRO7UXUT9BwZ3G+a9XzJj5v012FcCN/2qRhEsIV3x/0wkx2S08T4FiQEUPkB2uoYHpEjEneM7g==
9+
dependencies:
10+
"@microsoft/applicationinsights-core-js" "2.8.4"
11+
"@microsoft/applicationinsights-shims" "^2.0.1"
12+
"@microsoft/dynamicproto-js" "^1.1.6"
13+
14+
"@microsoft/1ds-post-js@^3.2.3":
15+
version "3.2.3"
16+
resolved "https://registry.yarnpkg.com/@microsoft/1ds-post-js/-/1ds-post-js-3.2.3.tgz#1fa7d51615a44f289632ae8c588007ba943db216"
17+
integrity sha512-tcGJQXXr2LYoBbIXPoUVe1KCF3OtBsuKDFL7BXfmNtuSGtWF0yejm6H83DrR8/cUIGMRMUP9lqNlqFGwDYiwAQ==
18+
dependencies:
19+
"@microsoft/1ds-core-js" "3.2.3"
20+
"@microsoft/applicationinsights-shims" "^2.0.1"
21+
"@microsoft/dynamicproto-js" "^1.1.6"
22+
23+
"@microsoft/[email protected]":
24+
version "2.8.4"
25+
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.8.4.tgz#607e531bb241a8920d43960f68a7c76a6f9af596"
26+
integrity sha512-FoA0FNOsFbJnLyTyQlYs6+HR7HMEa6nAOE6WOm9WVejBHMHQ/Bdb+hfVFi6slxwCimr/ner90jchi4/sIYdnyQ==
27+
dependencies:
28+
"@microsoft/applicationinsights-shims" "2.0.1"
29+
"@microsoft/dynamicproto-js" "^1.1.6"
30+
31+
"@microsoft/[email protected]", "@microsoft/applicationinsights-shims@^2.0.1":
32+
version "2.0.1"
33+
resolved "https://registry.yarnpkg.com/@microsoft/applicationinsights-shims/-/applicationinsights-shims-2.0.1.tgz#5d72fb7aaf4056c4fda54f9d7c93ccf8ca9bcbfd"
34+
integrity sha512-G0MXf6R6HndRbDy9BbEj0zrLeuhwt2nsXk2zKtF0TnYo39KgYqhYC2ayIzKPTm2KAE+xzD7rgyLdZnrcRvt9WQ==
35+
36+
"@microsoft/dynamicproto-js@^1.1.6":
37+
version "1.1.6"
38+
resolved "https://registry.yarnpkg.com/@microsoft/dynamicproto-js/-/dynamicproto-js-1.1.6.tgz#6fe03468862861f5f88ac4c3959a652b3797f1bc"
39+
integrity sha512-D1Oivw1A4bIXhzBIy3/BBPn3p2On+kpO2NiYt9shICDK7L/w+cR6FFBUsBZ05l6iqzTeL+Jm8lAYn0g6G7DmDg==
40+
541
"@types/node-fetch@^2.5.7":
642
version "2.5.7"
743
resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
@@ -25,10 +61,13 @@
2561
resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.0.0.tgz#165aae4819ad2174a17476dbe66feebd549556c0"
2662
integrity sha512-xSQfNcvOiE5f9dyd4Kzxbof1aTrLobL278pGLKOZI6esGfZ7ts9Ka16CzIN6Y8hFHE1C7jIBZokULhK1bOgjRw==
2763

28-
"@vscode/[email protected]":
29-
version "0.6.1"
30-
resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.6.1.tgz#f8d1f7145baf932b75077c48107edff48501fc14"
31-
integrity sha512-Y4Oc8yGURGVF4WhCZcu+EVy+MAIeQDLDVeDlLn59H0C1w+7xr8dL2ZtDBioy+Hog1Edrd6zOwr3Na7xe1iC/UA==
64+
"@vscode/[email protected]":
65+
version "0.6.2"
66+
resolved "https://registry.yarnpkg.com/@vscode/extension-telemetry/-/extension-telemetry-0.6.2.tgz#b86814ee680615730da94220c2b03ea9c3c14a8e"
67+
integrity sha512-yb/wxLuaaCRcBAZtDCjNYSisAXz3FWsSqAha5nhHcYxx2ZPdQdWuZqVXGKq0ZpHVndBWWtK6XqtpCN2/HB4S1w==
68+
dependencies:
69+
"@microsoft/1ds-core-js" "^3.2.3"
70+
"@microsoft/1ds-post-js" "^3.2.3"
3271

3372
asynckit@^0.4.0:
3473
version "0.4.0"

‎extensions/html-language-features/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"version": "1.0.0",
66
"publisher": "vscode",
77
"license": "MIT",
8-
"aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
8+
"aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
99
"engines": {
1010
"vscode": "0.10.x"
1111
},

0 commit comments

Comments
 (0)