Skip to content

Commit 233d341

Browse files
committed
Merge branch 'main' into typeof-coud-narrow-union-type
2 parents de05f31 + a9efe2b commit 233d341

File tree

1,217 files changed

+115906
-80374
lines changed

Some content is hidden

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

1,217 files changed

+115906
-80374
lines changed

.github/pr_owners.txt

+2
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ jessetrinity
1212
minestarks
1313
armanio123
1414
gabritto
15+
jakebailey
16+
DanielRosenwasser

.github/pull_request_template.md

+7
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ Please verify that:
99
1010
Refer to CONTRIBUTING.MD for more details.
1111
https://github.com/Microsoft/TypeScript/blob/main/CONTRIBUTING.md
12+
13+
** Please don't send typo fixes! **
14+
Please don't send a PR solely for the purpose of fixing a typo, unless that
15+
typo truly hurts understanding of the text. Each PR represents work for the
16+
maintainers, and that work should provide commensurate value.
17+
18+
If you're interested in sending a PR, the issue tracker has many issues marked `help wanted`.
1219
-->
1320

1421
Fixes #
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Ensures that repos which are related to TypeScript but may not have regular commits
2+
# have their GitHub Actions scheduled jobs still active due to the 6 week timeout
3+
# on OSS repos. This has already triggered a few times with microsoft/TypeScript-Make-Monaco-Builds
4+
# so, better to automate keeping on top of it.
5+
6+
name: Related Repo Commit Bumps
7+
8+
on:
9+
schedule:
10+
# Monthly, https://crontab.guru/#0_0_*_1-12_*
11+
- cron: '0 0 1 * *'
12+
workflow_dispatch: {}
13+
14+
jobs:
15+
build:
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- name: Configure git and update package-lock.json
20+
run: |
21+
git config --global user.email "typescriptbot@microsoft.com"
22+
git config --global user.name "TypeScript Bot"
23+
24+
- uses: actions/checkout@v2
25+
with:
26+
repository: 'microsoft/TypeScript-Website'
27+
path: 'ts-site'
28+
29+
- name: Push Commit to TS Website
30+
run: |
31+
cd ts-site
32+
git commit --allow-empty -m "Monthly Bump"
33+
git push https://${{ secrets.TS_BOT_GITHUB_TOKEN }}@github.com/microsoft/TypeScript-Website.git
34+
35+
- uses: actions/checkout@v2
36+
with:
37+
repository: 'microsoft/TypeScript-Make-Monaco-Builds'
38+
path: 'monaco-builds'
39+
40+
- name: Push Commit to TS Make Monaco Builds
41+
run: |
42+
cd monaco-builds
43+
git commit --allow-empty -m "Monthly Bump"
44+
git push https://${{ secrets.TS_BOT_GITHUB_TOKEN }}@github.com/microsoft/TypeScript-Make-Monaco-Builds.git

.vscode/launch.template.json

+2-10
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,15 @@
4848
"outFiles": [
4949
"${workspaceRoot}/built/local/run.js"
5050
],
51-
52-
// NOTE: To use this, you must switch the "type" above to "pwa-node". You may also need to follow the instructions
53-
// here: https://github.com/microsoft/vscode-js-debug#nightly-extension to use the js-debug nightly until
54-
// this feature is shipping in insiders or to a release:
55-
// "customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue"
51+
"customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue",
5652
},
5753
{
5854
// See: https://github.com/microsoft/TypeScript/wiki/Debugging-Language-Service-in-VS-Code
5955
"type": "node",
6056
"request": "attach",
6157
"name": "Attach to VS Code TS Server via Port",
6258
"processId": "${command:PickProcess}",
63-
64-
// NOTE: To use this, you must switch the "type" above to "pwa-node". You may also need to follow the instructions
65-
// here: https://github.com/microsoft/vscode-js-debug#nightly-extension to use the js-debug nightly until
66-
// this feature is shipping in insiders or to a release:
67-
// "customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue"
59+
"customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue",
6860
}
6961
]
7062
}

.vscode/settings.template.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
// contents into your existing settings.
33
{
44
"eslint.validate": [
5-
{
6-
"language": "typescript",
7-
"autoFix": true
8-
}
5+
"typescript"
96
],
107
"eslint.options": {
118
"rulePaths": ["./scripts/eslint/built/rules/"],
@@ -16,4 +13,4 @@
1613

1714
// To use the locally built compiler, after 'npm run build':
1815
// "typescript.tsdk": "built/local"
19-
}
16+
}

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Some search tips:
2020
## 3. Do you have a question?
2121

2222
The issue tracker is for **issues**, in other words, bugs and suggestions.
23-
If you have a *question*, please use [Stack Overflow](http://stackoverflow.com/questions/tagged/typescript), [Gitter](https://gitter.im/Microsoft/TypeScript), your favorite search engine, or other resources.
23+
If you have a *question*, please use [Stack Overflow](https://stackoverflow.com/questions/tagged/typescript), [Gitter](https://gitter.im/Microsoft/TypeScript), your favorite search engine, or other resources.
2424
Due to increased traffic, we can no longer answer questions in the issue tracker.
2525

2626
## 4. Did you find a bug?

0 commit comments

Comments
 (0)