Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
with:
node-version: "18.x"
node-version: "20.x"
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0

- run: pnpm install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod-static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
with:
node-version: "18.x"
node-version: "20.x"

- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
token: ${{ secrets.TS_BOT_TOKEN }}
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
with:
node-version: "18.x"
node-version: "20.x"
registry-url: "https://registry.npmjs.org/"
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0

Expand Down
2 changes: 0 additions & 2 deletions .npmrc

This file was deleted.

4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@

目前为了保持稳定,我们仍然采取原有的本地化方式进行构建,即在本仓库触发 Vercel 的构建。而在 [ts-zh-docs/TypeScript-zh-Website](https://github.com/ts-zh-docs/TypeScript-zh-Website) 进行更新。一切有关翻译的讨论都将移至那个仓库,本仓库只负责构建工作。**中文文档的线上地址请访问[这里](https://www.tslang.com.cn)**。

<<<<<<< HEAD
本地开发环境构建步骤:
=======
This repo uses pnpm workspaces with node 20+, and [watchman](https://facebook.github.io/watchman/docs/install.html). (Windows users can install [watchman via chocolatey](https://chocolatey.org/packages/watchman))
>>>>>>> 6a12128c9ee429a39e41981473f89a88b5cec7b3

1. 使用 Node 18.x 版本。
2. 使用 `pnpm` 命令安装依赖。
Expand Down
53 changes: 36 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,71 @@
"private": true,
"name": "root",
"engines": {
<<<<<<< HEAD
"node": "20",
"pnpm": ">=9"
=======
"node": ">= 20.19"
>>>>>>> 6a12128c9ee429a39e41981473f89a88b5cec7b3
},
"devDependencies": {
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.5",
"@changesets/changelog-github": "^0.5.2",
"@changesets/cli": "^2.29.8",
"@oss-docs/sync": "^1.1.4",
"@types/express": "^4.17.6",
"@types/node": "^18.19.121",
"@types/react": "^18.3.2",
"@types/express": "^5.0.6",
"@types/node": "^25.2.3",
"@types/prettier": "^2.7.3",
"@types/react": "^18.3.28",
"chalk": "^4.1.2",
"concurrently": "^8.2.2",
"cross-env": "^7.0.2",
"concurrently": "^9.2.1",
"cross-env": "^10.1.0",
"danger": "^13.0.5",
"danger-plugin-lighthouse": "^0.5.2",
"danger-plugin-spellcheck": "^2.1.0",
"fb-watchman": "^2.0.1",
"glob": "^7.2.3",
"fb-watchman": "^2.0.2",
"glob": "^13.0.5",
"gray-matter": "4.0.3",
"reflect-metadata": "^0.1.13",
"prettier": "^2.8.8",
"reflect-metadata": "^0.2.2",
"remark": "^11.0.2",
"remark-html": "^10.0.0",
"remark-shiki-twoslash": "^3.1.3",
"serve-handler": "^6.1.2"
"serve-handler": "^6.1.6"
},
"pnpm": {
"overrides": {
"remark-shiki-twoslash>@typescript/twoslash": "link:./packages/ts-twoslasher",
"remark-shiki-twoslash>@typescript/vfs": "link:./packages/typescript-vfs",
"shiki-twoslash>@typescript/twoslash": "link:./packages/ts-twoslasher",
"shiki-twoslash>@typescript/vfs": "link:./packages/typescript-vfs",
"@types/react": "^18.2.77",
"@types/react": "^18.3.28",
"@types/estree": "0.0.46",
"@types/eslint": "7.29.0",
"assert": "2.0.0",
"rollup-plugin-typescript2": "0.36.0",
"typescript": "6.0.0-dev.20260213",
"tslib": "^2.6.2",
"prettier": "^2.0.2",
"sharp": "0.28.1"
},
"patchedDependencies": {
"react-server-dom-webpack@0.0.0-experimental-c8b778b7f-20220825": "patches/react-server-dom-webpack@0.0.0-experimental-c8b778b7f-20220825.patch",
"react-intl@3.12.1": "patches/react-intl@3.12.1.patch",
"gatsby-remark-shiki-twoslash@3.0.38": "patches/gatsby-remark-shiki-twoslash@3.0.38.patch"
}
},
"ignoredBuiltDependencies": [
"@parcel/watcher",
"core-js",
"core-js-pure",
"es5-ext",
"lmdb",
"msgpackr-extract",
"spawn-sync",
"unrs-resolver"
],
"onlyBuiltDependencies": [
"esbuild",
"gatsby",
"gatsby-cli",
"sharp"
]
},
"jest": {
"transformIgnorePatterns": [
Expand Down Expand Up @@ -76,5 +95,5 @@
],
"onlyPublishWithReleaseLabel": true
},
"packageManager": "pnpm@9.1.2+sha256.19c17528f9ca20bd442e4ca42f00f1b9808a9cb419383cd04ba32ef19322aba7"
"packageManager": "pnpm@10.30.0+sha512.2b5753de015d480eeb88f5b5b61e0051f05b4301808a82ec8b840c9d2adf7748eb352c83f5c1593ca703ff1017295bc3fdd3119abb9686efc96b9fcb18200937"
}
6 changes: 3 additions & 3 deletions packages/ata/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
"access": "public"
},
"devDependencies": {
"@types/jest": "^29.5.12",
"@types/jest": "^30.0.0",
"cpy-cli": "^3.1.1",
"esbuild": "^0.17.8",
"esbuild": "^0.27.3",
"esbuild-jest": "^0.5.0",
"jest": "^29.5.0"
"jest": "^30.2.0"
},
"peerDependencies": {
"typescript": ">=4.4.4"
Expand Down
6 changes: 2 additions & 4 deletions packages/community-meta/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@
"license": "MIT",
"version": "1.0.0",
"dependencies": {
"moment": "2.24.0",
"moment-timezone": "0.5.28"
"moment": "2.30.1",
"moment-timezone": "0.6.0"
},
"scripts": {
"build": "node scripts/generateRichMeetupData.js"
},
"devDependencies": {
}
}
6 changes: 6 additions & 0 deletions packages/create-typescript-playground-plugin/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# create-typescript-playground-plugin

## 1.3.3

### Patch Changes

- [#3509](https://github.com/microsoft/TypeScript-Website/pull/3509) [`0daa298`](https://github.com/microsoft/TypeScript-Website/commit/0daa298f2f4526f8c66baff00b8df0290e37a4d4) Thanks [@jakebailey](https://github.com/jakebailey)! - Bump dependencies

## 1.3.2

### Patch Changes
Expand Down
8 changes: 4 additions & 4 deletions packages/create-typescript-playground-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-typescript-playground-plugin",
"version": "1.3.2",
"version": "1.3.3",
"bin": "index.js",
"author": "TypeScript team",
"license": "MIT",
Expand All @@ -15,8 +15,8 @@
},
"scripts": {},
"dependencies": {
"cross-spawn": "^7.0.5",
"gunzip-maybe": "^1.4.1",
"tar-fs": "^2.1.0"
"cross-spawn": "^7.0.6",
"gunzip-maybe": "^1.4.2",
"tar-fs": "^3.1.1"
}
}
2 changes: 1 addition & 1 deletion packages/glossary/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"semi": true
},
"devDependencies": {
"ts-node": "*"
"ts-node": "^10.9.2"
}
}
2 changes: 1 addition & 1 deletion packages/playground-examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"devDependencies": {
"@types/fs-extra": "^11.0.4",
"fs-extra": "^11.2.0",
"fs-extra": "^11.3.3",
"json5": "^2.2.3"
}
}
2 changes: 1 addition & 1 deletion packages/playground-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "esbuild index.ts --outdir=../typescriptlang-org/static/js/playground-worker --format=esm --target=es2020 --bundle"
},
"dependencies": {
"esbuild": "^0.17.8"
"esbuild": "^0.27.3"
},
"devDependencies": {
"typescript": "*"
Expand Down
10 changes: 5 additions & 5 deletions packages/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
"dependencies": {
"@typescript/playground-worker": "workspace:*",
"@typescript/sandbox": "workspace:*",
"esbuild": "^0.17.8"
"esbuild": "^0.27.3"
},
"devDependencies": {
"@types/jest": "^29.5.12",
"@types/react": "^18.3.2",
"jest": "^29.5.0",
"@types/jest": "^30.0.0",
"@types/react": "^18.3.28",
"jest": "^30.2.0",
"monaco-editor": "^0.32.1",
"monaco-typescript": "^3.7.0",
"monaco-typescript": "^4.10.0",
"typescript": "*"
}
}
13 changes: 13 additions & 0 deletions packages/sandbox/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# @typescript/sandbox

## 0.1.13

### Patch Changes

- [#3505](https://github.com/microsoft/TypeScript-Website/pull/3505) [`2072484`](https://github.com/microsoft/TypeScript-Website/commit/20724842b6eaf09f5c5d0ee40272c5569fe5c37d) Thanks [@DanielRosenwasser](https://github.com/DanielRosenwasser)! - Fix Ctrl+arrow keys in Firefox.

## 0.1.12

### Patch Changes

- Updated dependencies [[`0daa298`](https://github.com/microsoft/TypeScript-Website/commit/0daa298f2f4526f8c66baff00b8df0290e37a4d4)]:
- @typescript/vfs@1.6.4

## 0.1.11

### Patch Changes
Expand Down
12 changes: 6 additions & 6 deletions packages/sandbox/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@typescript/sandbox",
"version": "0.1.11",
"version": "0.1.13",
"license": "MIT",
"author": "TypeScript team",
"homepage": "https://github.com/microsoft/TypeScript-Website",
Expand Down Expand Up @@ -48,13 +48,13 @@
"lz-string": "^1.5.0"
},
"devDependencies": {
"@rollup/plugin-commonjs": "^25.0.7",
"@types/jest": "^29.5.12",
"@rollup/plugin-commonjs": "^29.0.0",
"@types/jest": "^30.0.0",
"dts-cli": "^2.0.5",
"jest": "^29.5.0",
"jest": "^30.2.0",
"monaco-editor": "^0.32.1",
"monaco-typescript": "^3.7.0",
"ts-jest": "^29.0.5",
"monaco-typescript": "^4.10.0",
"ts-jest": "^29.4.6",
"typescript": "*"
}
}
2 changes: 1 addition & 1 deletion packages/sandbox/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const sharedEditorOptions: import("monaco-editor").editor.IEditorOptions = {
},
acceptSuggestionOnCommitCharacter: !isAndroid,
acceptSuggestionOnEnter: !isAndroid ? "on" : "off",
accessibilitySupport: !isAndroid ? "on" : "off",
accessibilitySupport: !isAndroid ? "auto" : "off",
inlayHints: {
enabled: true,
},
Expand Down
9 changes: 9 additions & 0 deletions packages/ts-twoslasher/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @typescript/twoslash

## 3.2.12

### Patch Changes

- [#3509](https://github.com/microsoft/TypeScript-Website/pull/3509) [`0daa298`](https://github.com/microsoft/TypeScript-Website/commit/0daa298f2f4526f8c66baff00b8df0290e37a4d4) Thanks [@jakebailey](https://github.com/jakebailey)! - Bump dependencies

- Updated dependencies [[`0daa298`](https://github.com/microsoft/TypeScript-Website/commit/0daa298f2f4526f8c66baff00b8df0290e37a4d4)]:
- @typescript/vfs@1.6.4

## 3.2.11

### Patch Changes
Expand Down
20 changes: 9 additions & 11 deletions packages/ts-twoslasher/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@typescript/twoslash",
"version": "3.2.11",
"version": "3.2.12",
"license": "MIT",
"author": "TypeScript team",
"homepage": "https://github.com/microsoft/TypeScript-Website",
Expand Down Expand Up @@ -28,16 +28,14 @@
"lint": "dts lint"
},
"devDependencies": {
"@types/jest": "^29.5.12",
"@types/prettier": "^2.7.3",
"@types/jest": "^30.0.0",
"dts-cli": "^2.0.5",
"jest": "^29.5.0",
"jest-file-snapshot": "^0.3.8",
"markdown-magic": "^1.0.0",
"preact": "^10.5.13",
"prettier": "^2.3.2",
"ts-jest": "^29.0.5",
"tslib": "^2.6.2",
"jest": "^30.2.0",
"jest-file-snapshot": "^0.7.0",
"markdown-magic": "^4.8.0",
"preact": "^10.28.3",
"ts-jest": "^29.4.6",
"tslib": "^2.8.1",
"typescript": "*"
},
"jest": {
Expand All @@ -53,7 +51,7 @@
},
"dependencies": {
"@typescript/vfs": "workspace:*",
"debug": "^4.1.1",
"debug": "^4.4.3",
"lz-string": "^1.5.0"
},
"peerDependencies": {
Expand Down
16 changes: 8 additions & 8 deletions packages/tsconfig-reference/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"license": "MIT",
"private": true,
"scripts": {
"generate:json:tsconfig": "tsc --build && node --experimental-json-modules scripts/tsconfig/generateJSON",
"generate:json:cli": "tsc --build && node --experimental-json-modules scripts/cli/generateJSON",
"generate:json:schema": "tsc --build && node --experimental-json-modules scripts/schema/generateJSON",
"generate:json:msbuild": "tsc --build && node --experimental-json-modules scripts/msbuild/generateJSON",
"generate:json:tsconfig": "tsc --build && node scripts/tsconfig/generateJSON",
"generate:json:cli": "tsc --build && node scripts/cli/generateJSON",
"generate:json:schema": "tsc --build && node scripts/schema/generateJSON",
"generate:json:msbuild": "tsc --build && node scripts/msbuild/generateJSON",
"generate:json": "pnpm generate:json:tsconfig && pnpm generate:json:cli && pnpm generate:json:schema && pnpm generate:json:msbuild",
"generate:md:tsconfig": "tsc --build && node --experimental-json-modules scripts/tsconfig/generateMarkdown",
"generate:md:cli": "tsc --build && node --experimental-json-modules scripts/cli/generateMarkdown",
"generate:md:msbuild": "tsc --build && node --experimental-json-modules scripts/msbuild/generateMarkdown",
"generate:md:tsconfig": "tsc --build && node scripts/tsconfig/generateMarkdown",
"generate:md:cli": "tsc --build && node scripts/cli/generateMarkdown",
"generate:md:msbuild": "tsc --build && node scripts/msbuild/generateMarkdown",
"generate:md": "pnpm generate:md:tsconfig && pnpm generate:md:cli && pnpm generate:md:tsconfig",
"download": "node scripts/schema/downloadSchemaBase.js",
"bootstrap": "pnpm generate:json",
Expand All @@ -25,7 +25,7 @@
},
"devDependencies": {
"@types/json-schema": "^7.0.15",
"ts-node": "*",
"ts-node": "^10.9.2",
"typescript": "*",
"typescript-for-docs": "npm:typescript@5.9.3",
"xml-js": "^1.6.11"
Expand Down
6 changes: 6 additions & 0 deletions packages/typescript-vfs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @typescript/vfs

## 1.6.4

### Patch Changes

- [#3509](https://github.com/microsoft/TypeScript-Website/pull/3509) [`0daa298`](https://github.com/microsoft/TypeScript-Website/commit/0daa298f2f4526f8c66baff00b8df0290e37a4d4) Thanks [@jakebailey](https://github.com/jakebailey)! - Bump dependencies

## 1.6.3

### Patch Changes
Expand Down
Loading
Loading