Merge pull request #861 from microsoft/jsx_ref_updates

Improve the JSX docs
microsoft · Aug 6, 2020 · b0335ef · b0335ef
2 parents 1c029ce + 450ae96
commit b0335ef
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 8 deletions.
diff --git a/packages/tsconfig-reference/copy/en/options/jsx.md b/packages/tsconfig-reference/copy/en/options/jsx.md
@@ -6,6 +6,60 @@ oneline: "Control how JSX is emitted"
 Controls how JSX constructs are emitted in JavaScript files.
 This only affects output of JS files that started in `.tsx` files.
 
-- `preserve`: Emit `.jsx` files with the JSX unchanged
 - `react`: Emit `.js` files with JSX changed to the equivalent `React.createElement` calls
+- `preserve`: Emit `.jsx` files with the JSX unchanged
 - `react-native`: Emit `.js` files with the JSX unchanged
+
+<!-- This is blocked on https://github.com/microsoft/TypeScript-Website/issues/860
+
+### For example
+
+This sample code:
+
+```ts
+export const helloWorld = () => <h1>Hello world</h1>;
+```
+
+Default: ("react")
+
+```tsx twoslash
+declare module JSX {
+  interface Element {}
+  interface IntrinsicElements {
+    [s: string]: any;
+  }
+}
+// @showEmit
+// @noErrors
+export const helloWorld = () => <h1>Hello world</h1>;
+```
+
+Preserve:
+
+```ts twoslash
+declare module JSX {
+  interface Element {}
+  interface IntrinsicElements {
+    [s: string]: any;
+  }
+}
+// @showEmit
+// @noErrors
+// @jsx: preserve
+export const helloWorld = () => <h1>Hello world</h1>;
+```
+
+React Native:
+
+````ts twoslash
+declare module JSX {
+  interface Element {}
+  interface IntrinsicElements {
+    [s: string]: any;
+  }
+}
+// @showEmit
+// @noErrors
+// @jsx: react-native
+export const helloWorld = () => <h1>Hello world</h1>;
+````
diff --git a/packages/tsconfig-reference/scripts/tsconfigRules.ts b/packages/tsconfig-reference/scripts/tsconfigRules.ts
@@ -117,7 +117,7 @@ export const defaultsForOptions = {
   inlineSourceMap: "false",
   inlineSources: "false",
   isolatedModules: "false",
-  jsx: '`"preserve"`',
+  jsx: '`"react"`',
   jsxFactory: "`React.createElement`",
   keyofStringsOnly: "false",
   listEmittedFiles: "false",

diff --git a/packages/typescriptlang-org/src/redirects/setupRedirects.ts b/packages/typescriptlang-org/src/redirects/setupRedirects.ts
@@ -31,7 +31,9 @@ export const setupRedirects = (
     const fromArray = Object.keys(obj)
     fromArray.forEach(from => {
       const to = obj[from]
-      console.log(`Making redirect from ${from} to ${to}`)
+      if (process.env.CI) {
+        console.log(`Making redirect from ${from} to ${to}`)
+      }
       createRedirect({
         isPermanent: true,
         redirectInBrowser: true,

diff --git a/packages/typescriptlang-org/tsconfig.json b/packages/typescriptlang-org/tsconfig.json
@@ -4,13 +4,8 @@
     "target": "esnext",
     "module": "commonjs",
     "lib": ["dom", "es2017"],
-    // "allowJs": true,
-    // "checkJs": true,
-    "jsx": "react",
     "strict": true,
     "esModuleInterop": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
     "noEmit": true,
     "skipLibCheck": true,
     "noImplicitAny": false,