Skip to content

Commit 187e9dd

Browse files
joaomorenojoaomoreno
committed
Merge branch 'master' into joao/submenus
2 parents 42d6c1f + dcf5b38 commit 187e9dd

138 files changed

Lines changed: 2959 additions & 1119 deletions

File tree

Some content is hidden

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

‎.github/workflows/feature-request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
upvotesRequired: 20
3636
numCommentsOverride: 20
3737
initComment: "This feature request is now a candidate for our backlog. The community has 60 days to [upvote](https://github.com/microsoft/vscode/wiki/Issues-Triaging#up-voting-a-feature-request) the issue. If it receives 20 upvotes we will move it to our backlog. If not, we will close it. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
38-
warnComment: "This feature request has not yet received the 20 community [upvotes](https://github.com/microsoft/vscode/wiki/Issues-Triaging#up-voting-a-feature-request) it takes to make to our backlog. 10 days to go. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding"
38+
warnComment: "This feature request has not yet received the 20 community [upvotes](https://github.com/microsoft/vscode/wiki/Issues-Triaging#up-voting-a-feature-request) it takes to make to our backlog. 10 days to go. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
3939
acceptComment: ":slightly_smiling_face: This feature request received a sufficient number of community upvotes and we moved it to our backlog. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
4040
rejectComment: ":slightly_frowning_face: In the last 60 days, this feature request has received less than 20 community upvotes and we closed it. Still a big Thank You to you for taking the time to create this issue! To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!"
4141
warnDays: 10

‎build/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"minimist": "^1.2.3",
4545
"request": "^2.85.0",
4646
"terser": "4.3.8",
47-
"typescript": "^4.0.0-dev.20200715",
47+
"typescript": "^4.0.0-dev.20200722",
4848
"vsce": "1.48.0",
4949
"vscode-telemetry-extractor": "^1.6.0",
5050
"xml2js": "^0.4.17"

‎build/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2530,10 +2530,10 @@ typescript@^3.0.1:
25302530
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
25312531
integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
25322532

2533-
typescript@^4.0.0-dev.20200715:
2534-
version "4.0.0-dev.20200715"
2535-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200715.tgz#d65961a5a6f13fde95a6f4db5f5946f15e4c59bc"
2536-
integrity sha512-gmPXoWktfXeutmWTM6el9U4vIn5kqOHGI1OESSOhPtLWrxodKqLfFuMygQtOUTtGjKLFQRFAJhHEwUhHZNOURA==
2533+
typescript@^4.0.0-dev.20200722:
2534+
version "4.0.0-dev.20200722"
2535+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.0-dev.20200722.tgz#b59dd5a3cd84a98d5aae0e4f3a3c58f0c81a3b9b"
2536+
integrity sha512-MmJ1YyPNK3JYeKLiTg5sQXdeZaMgt99Fg4BMRZhJmhoq1/x2V1cpXMYvE1rtIYl9K7NvmTDdU3WDW7ZOD6ybaw==
25372537

25382538
typical@^4.0.0:
25392539
version "4.0.0"

‎extensions/configuration-editing/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"url": "vscode://schemas/keybindings"
5555
},
5656
{
57-
"fileMatch": "vscode://defaultsettings/*/*.json",
57+
"fileMatch": "vscode://defaultsettings/defaultSettings.json",
5858
"url": "vscode://schemas/settings/default"
5959
},
6060
{

‎extensions/git/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1801,7 +1801,7 @@
18011801
"Ignore",
18021802
"ignore"
18031803
],
1804-
"filenames": [
1804+
"extensions": [
18051805
".gitignore_global",
18061806
".gitignore"
18071807
],

‎extensions/git/src/main.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ async function createModel(context: ExtensionContext, outputChannel: OutputChann
7474
new GitTimelineProvider(model)
7575
);
7676

77-
await checkGitVersion(info);
77+
checkGitVersion(info);
7878

7979
return model;
8080
}

‎extensions/npm/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
"languages": [
4141
{
4242
"id": "ignore",
43-
"filenames": [
43+
"extensions": [
4444
".npmignore"
4545
]
4646
},
4747
{
4848
"id": "properties",
49-
"filenames": [
49+
"extensions": [
5050
".npmrc"
5151
]
5252
}

‎extensions/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.1",
44
"description": "Dependencies shared by all extensions",
55
"dependencies": {
6-
"typescript": "3.9.6"
6+
"typescript": "3.9.7"
77
},
88
"scripts": {
99
"postinstall": "node ./postinstall"

‎extensions/typescript-language-features/extension-browser.webpack.config.js‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
'use strict';
99
const CopyPlugin = require('copy-webpack-plugin');
10+
const { lchmod } = require('graceful-fs');
11+
const Terser = require('terser');
1012

1113
const withBrowserDefaults = require('../shared.webpack.config').browser;
1214

@@ -19,7 +21,22 @@ module.exports = withBrowserDefaults({
1921
// @ts-ignore
2022
new CopyPlugin({
2123
patterns: [
22-
{ from: 'node_modules/typescript-web-server', to: 'typescript-web' }
24+
{
25+
from: 'node_modules/typescript-web-server',
26+
to: 'typescript-web',
27+
transform: (content, absoluteFrom) => {
28+
if (absoluteFrom.endsWith('tsserver.js')) {
29+
return Terser.minify(content.toString()).code;
30+
}
31+
return content;
32+
},
33+
transformPath: (targetPath) => {
34+
if (targetPath.endsWith('tsserver.js')) {
35+
return targetPath.replace('tsserver.js', 'tsserver.web.js');
36+
}
37+
return targetPath;
38+
}
39+
}
2340
],
2441
}),
2542
],

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"@types/rimraf": "2.0.2",
2929
"@types/semver": "^5.5.0",
3030
"copy-webpack-plugin": "^6.0.3",
31+
"terser": "^4.8.0",
3132
"typescript-web-server": "git://github.com/mjbvz/ts-server-web-build",
3233
"vscode": "^1.1.36"
3334
},
@@ -685,6 +686,22 @@
685686
"description": "%typescript.preferences.importModuleSpecifierEnding%",
686687
"scope": "resource"
687688
},
689+
"typescript.preferences.includePackageJsonAutoImports": {
690+
"type": "string",
691+
"enum": [
692+
"all",
693+
"exclude-dev",
694+
"none"
695+
],
696+
"enumDescriptions": [
697+
"%typescript.preferences.includePackageJsonAutoImports.all%",
698+
"%typescript.preferences.includePackageJsonAutoImports.excludeDev%",
699+
"%typescript.preferences.includePackageJsonAutoImports.none%"
700+
],
701+
"default": "exclude-dev",
702+
"markdownDescription": "%typescript.preferences.includePackageJsonAutoImports%",
703+
"scope": "window"
704+
},
688705
"javascript.preferences.renameShorthandProperties": {
689706
"type": "boolean",
690707
"default": true,

0 commit comments

Comments
 (0)