Merge v2

Author: orta

.github/workflows/CI.yml

@@ -25,7 +25,7 @@ jobs:
 
       - uses: microsoft/playwright-github-action@v1
 
-      # Install, should be absically instant if cached
+      # Install, should be basically instant if cached
       - run: yarn install
         env:
           YARN_CHECKSUM_BEHAVIOR: ignore

.github/workflows/deploy-prod.yml

@@ -24,6 +24,7 @@ jobs:
           yarn install
           yarn docs-sync pull microsoft/TypeScript-Website-localizations#main 1
           yarn bootstrap
+          yarn workspace typescriptlang-org setup-playground-cache-bust
           yarn build
         env:
           YARN_CHECKSUM_BEHAVIOR: ignore

.github/workflows/v2-merged-staging.yml

@@ -26,6 +26,8 @@ jobs:
           yarn install
           yarn docs-sync pull microsoft/TypeScript-Website-localizations#main 1
           yarn bootstrap
+          yarn workspace typescriptlang-org setup-playground-cache-bust
+          yarn workspace typescriptlang-org setup-staging
           yarn build
         env:
           YARN_CHECKSUM_BEHAVIOR: ignore
@@ -34,8 +36,6 @@ jobs:
         run: |
           yarn build-site
           cp -r packages/typescriptlang-org/public site
-        env:
-          GATSBY_TYPESCRIPT_SITE_STAGING: true
 
       - name: Deploy + Publish to CDN
         # You can find these keys here:

README.md

@@ -105,6 +105,16 @@ yarn workspace tsconfig-reference run lint resolveJson
 
 The docs for TypeScript. Originally ported over from [microsoft/TypeScript-Handbook](https://github.com/microsoft/TypeScript-Handbook/) then intermingled with [microsoft/TypeScript-New-Handbook](https://github.com/microsoft/TypeScript-New-Handbook), and finally updated for [Twoslash](http://www.staging-typescript.org/dev/twoslash/) and with new content.
 
+## JSON Schema
+
+It's a little odd, but the `tsconfig-reference` package creates the JSON schema for a TSConfig files:
+
+```sh
+yarn workspace tsconfig-reference build
+```
+
+Then you can find it at: [`packages/tsconfig-reference/scripts/schema/result/schema.json`](packages/tsconfig-reference/scripts/schema/result/schema.json).
+
 ## Playground Examples
 
 The code samples used in the Playground split across many languages.

package.json

@@ -47,7 +47,7 @@
     "update-test-snapshots": "CI=true yarn workspaces foreach --include gatsby-remark-shiki-twoslash  --include @typescript/twoslash --include shiki-twoslash --include @typescript/vfs run test -u"
   },
   "dependencies": {
-    "@oss-docs/sync": "^1.1.1",
+    "@oss-docs/sync": "^1.1.3",
     "@types/express": "^4.17.6",
     "gray-matter": "4.0.2",
     "node-polyfill-webpack-plugin": "^1.1.0",

packages/documentation/copy/en/Nightly Builds.md

@@ -6,7 +6,7 @@ oneline: How to use a nightly build of TypeScript
 translatable: true
 ---
 
-A nightly build from the [TypeScript's `master`](https://github.com/Microsoft/TypeScript/tree/master) branch is published by midnight PST to npm.
+A nightly build from the [TypeScript's `main`](https://github.com/Microsoft/TypeScript/tree/main) branch is published by midnight PST to npm.
 Here is how you can get it and use it with your tools.
 
 ## Using npm
@@ -49,7 +49,7 @@ More information is available at the [TypeScript Plugin for Sublime Text install
 
 The nightly build currently does not include the full plugin setup, but we are working on publishing an installer on a nightly basis as well.
 
-1. Download the [VSDevMode.ps1](https://github.com/Microsoft/TypeScript/blob/master/scripts/VSDevMode.ps1) script.
+1. Download the [VSDevMode.ps1](https://github.com/Microsoft/TypeScript/blob/main/scripts/VSDevMode.ps1) script.
 
    > Also see our wiki page on [using a custom language service file](https://github.com/Microsoft/TypeScript/wiki/Dev-Mode-in-Visual-Studio#using-a-custom-language-service-file).
 

packages/documentation/copy/en/declaration-files/Introduction.md

@@ -7,7 +7,7 @@ oneline: "How to write a high-quality TypeScript Declaration (d.ts) file"
 
 The Declaration Files section is designed to teach you how to write a high-quality TypeScript Declaration File. We need to assume basic familiarity with the TypeScript language in order to get started.
 
-If you haven't already, you should read the [TypeScript Handbook](/docs/handbook/basic-types.html)
+If you haven't already, you should read the [TypeScript Handbook](/docs/handbook/2/basic-types.html)
 to familiarize yourself with basic concepts, especially types and modules.
 
 The most common case for learning how .d.ts files work is that you're typing an npm package with no types. 

packages/documentation/copy/en/declaration-files/templates/module.d.ts.md

@@ -74,7 +74,7 @@ export default pi;
 ```
 
 One style of exporting in CommonJS is to export a function.
-Because a function is also an object, then extra fields can be added are included in the export.
+Because a function is also an object, then extra fields can be added and are included in the export.
 
 ```js
 function getArrayLength(arr) {
@@ -105,7 +105,7 @@ declare namespace getArrayLength {
 export = getArrayLength;
 ```
 
-See [Module: Functions](module-function.d.ts.md) for details of how that works, and the [Modules reference](/docs/handbook/modules.html) page.
+See [Module: Functions](/docs/handbook/declaration-files/templates/module-function-d-ts.html) for details of how that works, and the [Modules reference](/docs/handbook/modules.html) page.
 
 ## Handling Many Consuming Import
 

packages/documentation/copy/en/get-started/TS for JS Programmers.md

@@ -171,9 +171,8 @@ function wrapInArray(obj: string | string[]) {
   if (typeof obj === "string") {
     return [obj];
 //          ^?
-  } else {
-    return obj;
   }
+  return obj;
 }
 ```
 

packages/documentation/copy/en/handbook-v2/Classes.md

@@ -516,7 +516,7 @@ This means that the base class constructor saw its own value for `name` during i
 
 #### Inheriting Built-in Types
 
-> Note: If you don't plan to inherit from built-in types like `Array`, `Error`, `Map`, etc., you may skip this section
+> Note: If you don't plan to inherit from built-in types like `Array`, `Error`, `Map`, etc. or your compilation target is explicitely set to `ES6`/`ES2015` or above, you may skip this section
 
 In ES2015, constructors which return an object implicitly substitute the value of `this` for any callers of `super(...)`.
 It is necessary for generated constructor code to capture any potential return value of `super(...)` and replace it with `this`.
@@ -661,7 +661,7 @@ Java, for example, considers this to be legal.
 On the other hand, C# and C++ chose that this code should be illegal.
 
 TypeScript sides with C# and C++ here, because accessing `x` in `Derived2` should only be legal from `Derived2`'s subclasses, and `Derived1` isn't one of them.
-Moreover, if accessing `x` through a `Derived2` reference is illegal (which it certainly should be!), then accessing it through a base class reference should never improve the situation.
+Moreover, if accessing `x` through a `Derived1` reference is illegal (which it certainly should be!), then accessing it through a base class reference should never improve the situation.
 
 See also [Why Can’t I Access A Protected Member From A Derived Class?](https://blogs.msdn.microsoft.com/ericlippert/2005/11/09/why-cant-i-access-a-protected-member-from-a-derived-class/) which explains more of C#'s reasoning.