Skip to content

Commit

Permalink
Merge branch 'main' into typeof-coud-narrow-union-type
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewbranch committed Jan 20, 2022
2 parents 60d9f2a + ad5ca67 commit 9370627
Show file tree
Hide file tree
Showing 1,188 changed files with 115,276 additions and 80,263 deletions.
2 changes: 2 additions & 0 deletions .github/pr_owners.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ jessetrinity
minestarks
armanio123
gabritto
jakebailey
DanielRosenwasser
7 changes: 7 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ Please verify that:
Refer to CONTRIBUTING.MD for more details.
https://github.com/Microsoft/TypeScript/blob/main/CONTRIBUTING.md
** Please don't send typo fixes! **
Please don't send a PR solely for the purpose of fixing a typo, unless that
typo truly hurts understanding of the text. Each PR represents work for the
maintainers, and that work should provide commensurate value.
If you're interested in sending a PR, the issue tracker has many issues marked `help wanted`.
-->

Fixes #
44 changes: 44 additions & 0 deletions .github/workflows/ensure-related-repos-run-crons.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Ensures that repos which are related to TypeScript but may not have regular commits
# have their GitHub Actions scheduled jobs still active due to the 6 week timeout
# on OSS repos. This has already triggered a few times with microsoft/TypeScript-Make-Monaco-Builds
# so, better to automate keeping on top of it.

name: Related Repo Commit Bumps

on:
schedule:
# Monthly, https://crontab.guru/#0_0_*_1-12_*
- cron: '0 0 1 * *'
workflow_dispatch: {}

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Configure git and update package-lock.json
run: |
git config --global user.email "typescriptbot@microsoft.com"
git config --global user.name "TypeScript Bot"
- uses: actions/checkout@v2
with:
repository: 'microsoft/TypeScript-Website'
path: 'ts-site'

- name: Push Commit to TS Website
run: |
cd ts-site
git commit --allow-empty -m "Monthly Bump"
git push https://${{ secrets.TS_BOT_GITHUB_TOKEN }}@github.com/microsoft/TypeScript-Website.git
- uses: actions/checkout@v2
with:
repository: 'microsoft/TypeScript-Make-Monaco-Builds'
path: 'monaco-builds'

- name: Push Commit to TS Make Monaco Builds
run: |
cd monaco-builds
git commit --allow-empty -m "Monthly Bump"
git push https://${{ secrets.TS_BOT_GITHUB_TOKEN }}@github.com/microsoft/TypeScript-Make-Monaco-Builds.git
12 changes: 2 additions & 10 deletions .vscode/launch.template.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,23 +48,15 @@
"outFiles": [
"${workspaceRoot}/built/local/run.js"
],

// NOTE: To use this, you must switch the "type" above to "pwa-node". You may also need to follow the instructions
// here: https://github.com/microsoft/vscode-js-debug#nightly-extension to use the js-debug nightly until
// this feature is shipping in insiders or to a release:
// "customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue"
"customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue",
},
{
// See: https://github.com/microsoft/TypeScript/wiki/Debugging-Language-Service-in-VS-Code
"type": "node",
"request": "attach",
"name": "Attach to VS Code TS Server via Port",
"processId": "${command:PickProcess}",

// NOTE: To use this, you must switch the "type" above to "pwa-node". You may also need to follow the instructions
// here: https://github.com/microsoft/vscode-js-debug#nightly-extension to use the js-debug nightly until
// this feature is shipping in insiders or to a release:
// "customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue"
"customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue",
}
]
}
7 changes: 2 additions & 5 deletions .vscode/settings.template.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
// contents into your existing settings.
{
"eslint.validate": [
{
"language": "typescript",
"autoFix": true
}
"typescript"
],
"eslint.options": {
"rulePaths": ["./scripts/eslint/built/rules/"],
Expand All @@ -16,4 +13,4 @@

// To use the locally built compiler, after 'npm run build':
// "typescript.tsdk": "built/local"
}
}
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Some search tips:
## 3. Do you have a question?

The issue tracker is for **issues**, in other words, bugs and suggestions.
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.
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.
Due to increased traffic, we can no longer answer questions in the issue tracker.

## 4. Did you find a bug?
Expand Down
Loading

0 comments on commit 9370627

Please sign in to comment.