Merge branch 'master'

Author: Josh Goldberg

.eslintrc.json

@@ -34,6 +34,7 @@
         ],
 
         "@typescript-eslint/consistent-type-definitions": ["error", "interface"],
+        "@typescript-eslint/consistent-type-assertions": ["error", { "assertionStyle": "as" }],
 
         "no-duplicate-imports": "off",
         "@typescript-eslint/no-duplicate-imports": "error",

.github/issue_template.md

@@ -20,11 +20,6 @@ jobs:
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-      
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1

.github/workflows/codeql.yml

@@ -0,0 +1,21 @@
+name: Sync Two Wiki Repos
+
+on: [gollum]
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Get repo name
+      run: R=${GITHUB_REPOSITORY%?wiki}; echo "BASENAME=${R##*/}" >> $GITHUB_ENV
+    - name: Checkout ${{ env.BASENAME }}-wiki
+      uses: actions/checkout@v2
+      with:
+        repository: "${{ GITHUB.repository_owner }}/${{ env.BASENAME }}-wiki"
+        token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
+        fetch-depth: 0
+    - name: Run sync
+      run: ./.github/workflows/sync
+      env:
+        PUSHER: typescript-bot <bot@typescriptlang.org>
+        AUTH: ${{ secrets.TS_BOT_GITHUB_TOKEN }}

.github/workflows/sync-wiki.yml

@@ -5,6 +5,7 @@ on:
         # This is probably 6am UTC, which is 10pm PST or 11pm PDT
         # Alternatively, 6am local is also fine
         - cron: '0 6 * * *'
+    workflow_dispatch: {}
 
 jobs:
   build:

.github/workflows/update-package-lock.yaml

@@ -170,7 +170,7 @@ You can also use the [provided VS Code launch configuration](./.vscode/launch.te
 
 ## Adding a Test
 
-To add a new test case, add a `.ts` file in `tests\cases\compiler` with code that shows the your bug is now fixed, or your new feature now works.
+To add a new test case, add a `.ts` file in `tests\cases\compiler` with code that shows the bug is now fixed, or your new feature now works.
 
 These files support metadata tags in the format  `// @metaDataName: value`.
 The supported names and values are the same as those supported in the compiler itself, with the addition of the `fileName` flag.

CONTRIBUTING.md

@@ -43,7 +43,7 @@ with any additional questions or comments.
 ## Documentation
 
 *  [TypeScript in 5 minutes](https://www.typescriptlang.org/docs/handbook/typescript-in-5-minutes.html)
-*  [Programming handbook](https://www.typescriptlang.org/docs/handbook/basic-types.html)
+*  [Programming handbook](https://www.typescriptlang.org/docs/handbook/intro.html)
 *  [Homepage](https://www.typescriptlang.org/)
 
 ## Building