diff --git a/docs/src/test-typescript-js.md b/docs/src/test-typescript-js.md
index 32d2c7a7f9..888392c30d 100644
--- a/docs/src/test-typescript-js.md
+++ b/docs/src/test-typescript-js.md
@@ -1,17 +1,109 @@
 ---
 id: test-typescript
-title: "Advanced: TypeScript"
+title: "TypeScript"
 ---
 
+Playwright Test supports TypeScript out of the box. You just write tests in TypeScript and Playwright Test will read them, transform to JavaScript and run. This works both with [CommonJS modules](https://nodejs.org/api/modules.html) and [ECMAScript modules](https://nodejs.org/api/esm.html).
+
+## TypeScript with CommonJS
+
+[Node.js](https://nodejs.org/en/) works with CommonJS modules **by default**. Unless you use `'.mjs'` or `'.mts'` extensions, or specify `type: "module"` in your `pacakge.json`, Playwright Test will treat all TypeScript files as CommonJS. You can then import as usual without an extension.
+
+Consider this helper module written in TypeScript:
+
+```js
+// helper.ts
+export const username = 'John';
+export const password = 'secret';
+```
+
+You can import from the helper as usual:
+
+```js
+// example.spec.ts
+import { test, expect } from '@playwright/test';
+import { username, password } from './helper';
+
+test('example', async ({ page }) => {
+  await page.locator('#username').fill(username);
+  await page.locator('#password').fill(password);
+});
+```
+
+## TypeScript with ESM
+
+You can opt into using [ECMAScript modules](https://nodejs.org/api/esm.html) by setting `type: "module"` in your `package.json` file. Playwright Test will switch to the ESM mode once it reads the `playwright.config.ts` file, so make sure you have one.
+
+Playwright Test follows the [experimental support for ESM in TypeScript](https://www.typescriptlang.org/docs/handbook/esm-node.html) and, according to the specification, **requires an extension** when importing from a module, either `'.js'` or `'.ts'`.
+
+First, enable modules in your `package.json`:
+
+```json
+{
+  "name": "my-package",
+  "version": "1.0.0",
+  "type": "module",
+}
+```
+
+Then write the helper module in TypeScript as usual:
+
+```js
+// helper.ts
+export const username = 'John';
+export const password = 'secret';
+```
+
+Specify the extension when importing from a module:
+
+```js
+// example.spec.ts
+import { test, expect } from '@playwright/test';
+import { username, password } from './helper.ts';
+
+test('example', async ({ page }) => {
+  await page.locator('#username').fill(username);
+  await page.locator('#password').fill(password);
+});
+```
+
+## TypeScript path mapping
+
+If you use [path mapping](https://www.typescriptlang.org/docs/handbook/module-resolution.html#path-mapping) in your `tsconfig.json`, Playwright Test will pick it up. Make sure that `baseUrl` is also set.
+
+Here is an example `tsconfig.json` that works with Playwright Test:
+
+```json
+{
+  "compilerOptions": {
+    "baseUrl": ".", // This must be specified if "paths" is.
+    "paths": {
+      "@myhelper/*": ["packages/myhelper/*"] // This mapping is relative to "baseUrl".
+    }
+  }
+}
+```
+
+You can now import using the mapped paths:
+
+```js
+// example.spec.ts
+import { test, expect } from '@playwright/test';
+import { username, password } from '@myhelper/credentials';
+
+test('example', async ({ page }) => {
+  await page.locator('#username').fill(username);
+  await page.locator('#password').fill(password);
+});
+```
+
 ## Manually compile tests with TypeScript
 
-Playwright Test supports TypeScript out of the box. We automatically transform
-TypeScript code to javascript to run it.
+Sometimes, Playwright Test will not be able to transform your TypeScript code correctly, for example when you are using experimental or very recent features of TypeScript, usually configured in `tsconfig.json`.
 
-However if you find that the TypeScript code is not being transpiled correctly,
-you can perform your own TypeScript compilation before sending the tests to Playwright.
+In this case, you can perform your own TypeScript compilation before sending the tests to Playwright.
 
-First I add a `tsconfig.json` file inside my tests directory.
+First add a `tsconfig.json` file inside the tests directory:
 
 ```json
 {
@@ -25,7 +117,7 @@ First I add a `tsconfig.json` file inside my tests directory.
 }
 ```
 
-In my `package.json`, I have two scripts:
+In `package.json`, add two scripts:
 
 ```json
 {