Sync with TypeScript-Website @ efd2adfa

.devcontainer/devcontainer.json

@@ -2,9 +2,17 @@
   "name": "TypeScript Website codespace",
   "dockerFile": "Dockerfile",
 
+  "features": {
+    "ghcr.io/devcontainers/features/github-cli": "latest",
+  },
+
   // Set *default* container specific settings.json values on container create.
-  "settings": {
-    "terminal.integrated.shell.linux": "/bin/bash"
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "terminal.integrated.shell.linux": "/bin/bash"
+      }
+    }
   },
 
   "forwardPorts": [8000],

.github/dependabot.yml

@@ -0,0 +1,22 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for more information:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://containers.dev/guide/dependabot
+
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+    groups:
+      github-actions:
+        patterns:
+          - '*'
+
+  - package-ecosystem: 'devcontainers'
+    directory: '/'
+    schedule:
+      interval: weekly
+

.github/workflows/CI.yml

@@ -24,10 +24,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
         with:
-          node-version: "18.x"
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+          node-version: "20.x"
+      - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
 
       - run: pnpm install
 
@@ -41,7 +41,7 @@ jobs:
       # Verify it compiles
       - run: pnpm build-site
 
-      - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      - uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         if: github.event_name == 'pull_request' && matrix.os == 'ubuntu-latest'
         with:
           name: site
@@ -50,12 +50,6 @@ jobs:
       # Run all the package's tests
       - run: pnpm test
 
-      # danger for PR builds
-      - if: github.event_name == 'pull_request' && github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id && matrix.os == 'ubuntu-latest'
-        run: "pnpm danger ci"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - run: |
           git add .
           if ! git diff --staged --exit-code --quiet; then
@@ -71,7 +65,7 @@ jobs:
 
       - name: Upload diff artifact
         if: ${{ failure() && steps.check-diff.conclusion == 'failure' }}
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: missing.patch
           path: missing.patch
@@ -83,10 +77,10 @@ jobs:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
         fetch-depth: 0
-    - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+    - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
       with:
         node-version: 'lts/*'
-    - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+    - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
 
     - run: pnpm install
 

.github/workflows/codeql.yml

@@ -44,7 +44,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
+        uses: github/codeql-action/init@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
         with:
           config-file: ./.github/codeql/codeql-configuration.yml
         # Override language selection by uncommenting this and choosing your languages
@@ -54,7 +54,7 @@ jobs:
       # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below).
       - name: Autobuild
-        uses: github/codeql-action/autobuild@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
+        uses: github/codeql-action/autobuild@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -68,4 +68,4 @@ jobs:
       #     make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
+        uses: github/codeql-action/analyze@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1

.github/workflows/deploy-preview.yml

@@ -132,7 +132,7 @@ jobs:
 
       - name: Download site build from PR
         if: ${{ steps.get-info.outputs.result != 'null' }}
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: site
           path: site

.github/workflows/deploy-prod-static.yml

@@ -31,11 +31,11 @@ jobs:
         with:
           # Fetch the full history, to build attribution.json
           fetch-depth: 0
-      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
         with:
-          node-version: "18.x"
+          node-version: "20.x"
 
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
 
       # Builds the modules, and boostraps the other modules
       - name: Build website
@@ -52,7 +52,7 @@ jobs:
           cp -r packages/typescriptlang-org/public site
 
       - name: Setup Pages
-        uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5
+        uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v3
@@ -69,4 +69,4 @@ jobs:
     steps:      
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4
+        uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0

.github/workflows/publish-packages.yml

@@ -22,11 +22,11 @@ jobs:
           fetch-depth: 0
           filter: blob:none
           token: ${{ secrets.TS_BOT_TOKEN }}
-      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
         with:
-          node-version: "18.x"
+          node-version: "20.x"
           registry-url: "https://registry.npmjs.org/"
-      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
+      - uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
 
       - name: Prepare website v2
         run: |

README.md

@@ -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))
+>>>>>>> 119f931a639c9215a27311fde459c6db0b8718e4
 
 1. 使用 Node 18.x 版本。
 2. 使用 `pnpm` 命令安装依赖。

package.json

@@ -2,52 +2,68 @@
   "private": true,
   "name": "root",
   "engines": {
+<<<<<<< HEAD
     "node": "20",
     "pnpm": ">=9"
+=======
+    "node": ">= 20.19"
+>>>>>>> 119f931a639c9215a27311fde459c6db0b8718e4
   },
   "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.3.3",
+    "@types/prettier": "^2.7.3",
+    "@types/react": "^18.3.28",
     "chalk": "^4.1.2",
-    "concurrently": "^8.2.2",
-    "cross-env": "^7.0.2",
-    "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",
+    "concurrently": "^9.2.1",
+    "cross-env": "^10.1.0",
+    "fb-watchman": "^2.0.2",
+    "glob": "^13.0.6",
     "gray-matter": "4.0.3",
-    "reflect-metadata": "^0.1.13",
-    "remark": "^11.0.2",
-    "remark-html": "^10.0.0",
-    "remark-shiki-twoslash": "^3.1.3",
-    "serve-handler": "^6.1.2"
+    "prettier": "^2.8.8",
+    "reflect-metadata": "^0.2.2",
+    "remark": "^13.0.0",
+    "remark-html": "^13.0.2",
+    "remark-shiki-twoslash": "^3.1.3"
   },
   "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",
+      "typescript": "6.0.2",
       "tslib": "^2.6.2",
-      "prettier": "^2.0.2",
-      "sharp": "0.28.1"
+      "sharp": "0.34.5",
+      "webpack": "^5.105.3"
     },
     "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": [
@@ -76,5 +92,5 @@
     ],
     "onlyPublishWithReleaseLabel": true
   },
-  "packageManager": "pnpm@9.1.2+sha256.19c17528f9ca20bd442e4ca42f00f1b9808a9cb419383cd04ba32ef19322aba7"
+  "packageManager": "pnpm@10.30.3+sha512.c961d1e0a2d8e354ecaa5166b822516668b7f44cb5bd95122d590dd81922f606f5473b6d23ec4a5be05e7fcd18e8488d47d978bbe981872f1145d06e9a740017"
 }

packages/ata/package.json

@@ -12,19 +12,19 @@
   "type": "module",
   "types": "src/userFacingTypes.d.ts",
   "scripts": {
-    "build": "esbuild src/index.ts --bundle --outfile=dist/index.js --format=esm --platform=node --target=es2015 && cpy src/userFacingTypes.d.ts dist/ --rename=index.d.ts && cpy src/ ../sandbox/src/vendor/ata",
+    "build": "esbuild src/index.ts --bundle --outfile=dist/index.js --format=esm --platform=node --target=es2015 && cpy src/userFacingTypes.d.ts dist/ --rename=index.d.ts && cpy src/ ../sandbox/src/vendor/ata --flat",
     "test": "jest",
     "bootstrap": "pnpm build"
   },
   "publishConfig": {
     "access": "public"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.12",
-    "cpy-cli": "^3.1.1",
-    "esbuild": "^0.17.8",
+    "@types/jest": "^30.0.0",
+    "cpy-cli": "^7.0.0",
+    "esbuild": "^0.27.3",
     "esbuild-jest": "^0.5.0",
-    "jest": "^29.5.0"
+    "jest": "^30.2.0"
   },
   "peerDependencies": {
     "typescript": ">=4.4.4"

packages/community-meta/package.json

@@ -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": {
   }
 }

packages/create-typescript-playground-plugin/CHANGELOG.md

@@ -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

packages/create-typescript-playground-plugin/package.json

@@ -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",
@@ -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"
   }
 }