Merge branch 'main' into asp

.github/workflows/CI.yml

@@ -10,21 +10,22 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: "18.x"
-
-      - run: yarn
-      - run: yarn docs-sync validate-against-en
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
+
+      - run: pnpm install
+      - run: pnpm docs-sync validate-against-en
 
   site-builds:
     runs-on: ubuntu-latest
 
     steps:
+      - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
           node-version: "18.x"
-
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
       # Clone this PR, and setup the deps
-      - uses: actions/checkout@v2
-      - run: yarn
+      - run: pnpm install
 
       # Clone the TS website, basically:
       # git clone https://github.com/microsoft/TypeScript-Website website
@@ -36,25 +37,25 @@ jobs:
 
       # Both the microsoft/TypeScript-Website & 1 - don't really need to be there, but 
       # this migrates the translated docs into the website
-      - run: yarn docs-sync pull microsoft/TypeScript-Website 1 --from-cwd . --to-cwd website
+      - run: pnpm docs-sync pull microsoft/TypeScript-Website 1 --from-cwd . --to-cwd website
 
       # Get dependencies for building the ebooks
       - run: sudo apt-get update
       - run: sudo apt install calibre
 
-      - run: yarn install
+      - run: pnpm install
         env:
-          YARN_CHECKSUM_BEHAVIOR: ignore
+          pnpm_CHECKSUM_BEHAVIOR: ignore
         working-directory: ./website
 
 
       # Verify the website build
-      - run: yarn bootstrap
+      - run: pnpm bootstrap
         working-directory: ./website
 
-      - run: yarn workspace typescriptlang-org build
+      - run: pnpm --filter typescriptlang-org build
         working-directory: ./website
 
       # # Verify the website build
-      # - run: yarn test
+      # - run: pnpm test
       #   working-directory: ./website

README.md

@@ -7,8 +7,8 @@ TypeScript 中文文档源码仓库。
 请先配置好 [TypeScript-Website](https://github.com/ts-zh-docs/TypeScript-Website)。对于本仓库你应该使用 Node 18.x 完成以下操作：
 
 ```sh
-yarn
-yarn pull-en
+pnpm i
+pnpm pull-en
 ```
 
 ### 翻译是如何运作的？ 
@@ -17,4 +17,4 @@ yarn pull-en
 
 例如：`/packages/documentation/copy/en/reference/JSX.md` 对应的路径应该是 `/packages/documentation/copy/zh/reference/JSX.md`.
 
-本翻译的 release notes 部分来自于 @zhongsp 的[翻译](https://github.com/zhongsp/TypeScript)，在此向他表示感谢。
+本翻译的 release notes 部分来自于 [@zhongsp](https://github.com/zhongsp) 的[翻译](https://github.com/zhongsp/TypeScript)，在此向他表示感谢。

package.json

@@ -7,7 +7,7 @@
     "pull-others": "docs-sync get-en microsoft/TypeScript-Website#v2 --all",
     "validate-paths": "docs-sync validate-against-en",
     "lint": "node scripts/lint.js",
-    "test": "yarn validate-paths && yarn lint"
+    "test": "pnpm validate-paths && pnpm lint"
   },
   "dependencies": {
     "@orta/markdown-translator": "^0.4.2",
@@ -23,5 +23,6 @@
     "remark": "^13.0.0",
     "typescript": "^4.1.3",
     "react-intl": "^3.12.1"
-  }
+  },
+  "packageManager": "[email protected]+sha256.19c17528f9ca20bd442e4ca42f00f1b9808a9cb419383cd04ba32ef19322aba7"
 }