revert most in #1818 (#1829)

Co-authored-by: Yucohny <79147654+Yucohny@users.noreply.github.com>
docschina · Nov 19, 2023 · 7c16cbd · 7c16cbd
1 parent e494859
commit 7c16cbd
Show file tree

Hide file tree

Showing 33 changed files with 3,653 additions and 3,938 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -0,0 +1,35 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI PR
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  pull_request:
+    branches: [cn]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: Install
+        run: |
+          yarn
+          yarn clean
+
+      - name: Build
+        run: |
+          yarn build
+
+      - name: Check Build
+        run: |
+          sudo -i
+          sudo chown -R $USER ./dist
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -9,6 +9,6 @@
 #     runs-on: ubuntu-latest
 #     steps:
 #       - name: 'Checkout Repository'
-#         uses: actions/checkout@v4
+#         uses: actions/checkout@v3
 #       - name: 'Dependency Review'
-#         uses: actions/dependency-review-action@v3
+#         uses: actions/dependency-review-action@v2
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,9 +1,11 @@
+# The file need not be maintained in the cn repo.
+
 name: Deploy
 
 on:
   push:
     branches:
-      - main
+      - master
   schedule:
     - cron: '0 0 * * *'
 jobs:
@@ -12,10 +14,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node-version: [latest]
+        node-version: [16.x]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
@@ -41,7 +43,7 @@ jobs:
       - run: yarn lint:links
 
       - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@v4.4.3
+        uses: JamesIves/github-pages-deploy-action@v4.4.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           folder: dist

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,4 +1,4 @@
-# This is a basic workflow to help you get started with Actions
+# This file should modified carefully.
 
 name: CI
 
@@ -18,7 +18,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
       - name: Install
         run: |

diff --git a/package.json b/package.json
@@ -28,15 +28,15 @@
     "clean-printable": "rimraf src/content/**/printable.mdx",
     "preclean": "run-s clean-dist clean-printable",
     "clean": "rimraf src/content/**/_*.mdx src/**/_*.json repositories/*.json",
-    "start": "npm run clean-dist && webpack serve --config webpack.dev.mjs --env dev --progress --define-process-env-node-env development",
+    "start": "npm run clean-dist && webpack serve --config webpack.dev.mjs --env dev --progress --node-env development",
     "content": "node src/scripts/build-content-tree.mjs ./src/content ./src/_content.json",
-    "bundle-analyze": "run-s clean fetch content && webpack --config webpack.prod.mjs --define-process-env-node-env production && run-s printable content && webpack --config webpack.ssg.mjs --define-process-env-node-env production --env ssg --profile --json > stats.json && webpack-bundle-analyzer stats.json",
+    "bundle-analyze": "run-s clean fetch content && webpack --config webpack.prod.mjs --node-env production && run-s printable content && webpack --config webpack.ssg.mjs --node-env production --env ssg --profile --json > stats.json && webpack-bundle-analyzer stats.json",
     "fetch-repos": "node src/utilities/fetch-package-repos.mjs",
     "fetch": "run-p fetch:*",
     "fetch:readmes": "node src/utilities/fetch-package-readmes.mjs",
     "fetch:supporters": "node src/utilities/fetch-supporters.mjs",
     "prebuild": "npm run clean",
-    "build": "run-s fetch-repos fetch content && webpack --config webpack.prod.mjs --define-process-env-node-env production && run-s printable content && webpack --config webpack.ssg.mjs --define-process-env-node-env production --env ssg",
+    "build": "run-s content && webpack --config webpack.prod.mjs --node-env production && run-s printable content && webpack --config webpack.ssg.mjs --node-env production --env ssg",
     "postbuild": "npm run sitemap",
     "build-test": "npm run build && http-server --port 4200 dist/",
     "serve-dist": "http-server --port 4200 dist/",
@@ -48,6 +48,9 @@
     "lint-markdown": "markdownlint --config ./.markdownlint.json",
     "lint:prose": "vale --config='.vale.ini' src/content",
     "lint:links": "hyperlink -c 8 --root dist -r dist/index.html --canonicalroot https://webpack.js.org/ --internal --skip /plugins/extract-text-webpack-plugin/ --skip /printable --skip https:// --skip http:// --skip sw.js > internal-links.tap; cat internal-links.tap | tap-spot",
+    "lint:heading": "textlint --fix src/content/*",
+    "lint:heading-blog": "textlint --fix src/content/blog/*",
+    "lint:headingMDX": "textlint --fix src/content/**/*.mdx",
     "sitemap": "cd dist && sitemap-static --ignore-file=../sitemap-ignore.json --pretty --prefix=https://webpack.js.org/ > sitemap.xml",
     "serve": "npm run build && sirv start ./dist --port 4000",
     "preprintable": "npm run clean-printable",
@@ -70,97 +73,102 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.22.19",
-    "@babel/eslint-parser": "^7.22.15",
+    "@babel/core": "^7.19.6",
+    "@babel/eslint-parser": "^7.19.1",
     "@babel/plugin-proposal-class-properties": "^7.17.12",
-    "@babel/preset-env": "^7.22.15",
-    "@babel/preset-react": "^7.22.15",
+    "@babel/preset-env": "^7.19.4",
+    "@babel/preset-react": "^7.18.6",
     "@mdx-js/loader": "^2.0.0-next.9",
-    "@octokit/auth-action": "^4.0.0",
-    "@octokit/rest": "^20.0.1",
+    "@octokit/auth-action": "^2.0.2",
+    "@octokit/rest": "^19.0.5",
     "@pmmmwh/react-refresh-webpack-plugin": "next",
-    "@svgr/webpack": "^8.1.0",
-    "autoprefixer": "^10.4.15",
-    "babel-loader": "^9.1.3",
+    "@svgr/webpack": "^6.5.1",
+    "autoprefixer": "^10.4.13",
+    "babel-loader": "^9.0.0",
     "copy-webpack-plugin": "^11.0.0",
-    "css-loader": "^6.8.1",
-    "css-minimizer-webpack-plugin": "^5.0.1",
-    "cypress": "^13.2.0",
-    "directory-tree": "^3.5.1",
+    "css-loader": "^6.7.1",
+    "css-minimizer-webpack-plugin": "^4.2.2",
+    "cypress": "^10.11.0",
+    "directory-tree": "^3.3.1",
     "directory-tree-webpack-plugin": "^1.0.3",
     "duplexer": "^0.1.1",
-    "eslint": "^8.49.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-cypress": "^2.14.0",
-    "eslint-plugin-mdx": "^2.2.0",
-    "eslint-plugin-react": "^7.33.2",
+    "eslint": "^8.26.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-cypress": "^2.12.1",
+    "eslint-plugin-mdx": "^2.0.5",
+    "eslint-plugin-react": "^7.31.10",
     "eslint-plugin-react-hooks": "^4.6.0",
     "front-matter": "^4.0.2",
     "github-slugger": "^2.0.0",
-    "html-webpack-plugin": "^5.5.3",
+    "html-loader": "^2.1.2",
+    "html-webpack-plugin": "^5.5.0",
     "http-server": "^14.1.1",
-    "husky": "^8.0.3",
+    "husky": "^8.0.1",
     "hyperlink": "^5.0.4",
     "jest": "^29.7.0",
-    "lightningcss": "^1.21.8",
-    "lint-staged": "^14.0.1",
+    "lightningcss": "^1.16.0",
+    "lint-staged": "^13.0.3",
     "lodash": "^4.17.21",
-    "markdownlint-cli": "^0.36.0",
-    "mdast-util-to-string": "^4.0.0",
-    "mini-css-extract-plugin": "^2.7.6",
-    "mkdirp": "^3.0.1",
+    "markdownlint": "^0.26.2",
+    "markdownlint-cli": "^0.32.2",
+    "mdast-util-to-string": "^3.1.0",
+    "mini-css-extract-plugin": "^2.6.1",
+    "mkdirp": "^1.0.4",
     "modularscale-sass": "^3.0.3",
+    "node-fetch": "^3.2.10",
     "npm-run-all": "^4.1.1",
-    "postcss": "^8.4.29",
-    "postcss-loader": "^7.3.3",
-    "prettier": "^3.0.3",
+    "postcss": "^8.4.18",
+    "postcss-loader": "^7.0.1",
+    "prettier": "^2.7.1",
     "react-refresh": "^0.14.0",
     "redirect-webpack-plugin": "^1.0.0",
-    "remark": "^14.0.3",
+    "remark": "^14.0.2",
     "remark-autolink-headings": "7.0.1",
-    "remark-emoji": "^4.0.0",
+    "remark-emoji": "^3.0.2",
     "remark-extract-anchors": "1.1.1",
     "remark-frontmatter": "^4.0.1",
     "remark-gfm": "^1.0.0",
-    "remark-html": "^15.0.2",
+    "remark-html": "^15.0.1",
     "remark-refractor": "montogeek/remark-refractor",
-    "rimraf": "^5.0.1",
-    "sass": "^1.67.0",
-    "sass-loader": "^13.3.2",
+    "rimraf": "^3.0.2",
+    "sass": "^1.55.0",
+    "sass-loader": "^13.1.0",
     "sirv-cli": "^2.0.2",
     "sitemap-static": "^0.4.2",
     "static-site-generator-webpack-plugin": "^3.4.1",
-    "style-loader": "^3.3.3",
-    "tailwindcss": "^3.3.3",
+    "style-loader": "^3.3.1",
+    "tailwindcss": "^3.2.1",
     "tap-spot": "^1.1.2",
-    "unist-util-visit": "^5.0.0",
-    "webpack": "^5.88.2",
-    "webpack-bundle-analyzer": "^4.9.1",
-    "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^4.15.1",
-    "webpack-merge": "^5.9.0",
-    "workbox-webpack-plugin": "^7.0.0",
-    "yarn-deduplicate": "^6.0.2"
+    "textlint": "^11.8.2",
+    "textlint-rule-heading": "^1.0.10",
+    "unist-util-visit": "^4.1.1",
+    "webpack": "^5.74.0",
+    "webpack-bundle-analyzer": "^4.7.0",
+    "webpack-cli": "^4.10.0",
+    "webpack-dev-server": "^4.11.1",
+    "webpack-merge": "^5.8.0",
+    "workbox-webpack-plugin": "^6.5.4",
+    "yarn-deduplicate": "^6.0.0"
   },
   "dependencies": {
     "@docsearch/react": "^3.0.0-alpha.50",
-    "@react-spring/web": "^9.7.3",
     "path-browserify": "^1.0.1",
     "prop-types": "^15.8.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-helmet-async": "^1.3.0",
-    "react-router-dom": "^6.16.0",
+    "react-router-dom": "^6.4.2",
+    "react-spring": "^9.5.5",
     "react-tiny-popover": "5",
     "react-use": "^17.4.0",
     "react-visibility-sensor": "^5.0.2",
     "webpack-pwa-manifest": "^4.3.0",
-    "workbox-window": "^7.0.0"
+    "webpack.vote": "https://github.com/webpack/voting-app.git",
+    "workbox-window": "^6.5.4"
   },
   "resolutions": {
     "sitemap-static/minimist": "1.2.5",
     "ini": "1.3.7",
-    "eval": "^0.1.5",
-    "markdownlint-cli/markdownlint": "^0.27.0"
+    "eval": "^0.1.5"
   }
 }
diff --git a/src/components/HelloDarkness.jsx b/src/components/HelloDarkness.jsx
@@ -52,7 +52,7 @@ export default function HelloDarkness() {
             xmlns="http://www.w3.org/2000/svg"
           >
             <path
-              d="M20.742 13.045a8.086 8.086 0 0 1-2.077.271c-2.135 0-4.14-.83-5.646-2.336a8.026 8.026 0 0 1-2.064-7.723A1 1 0 0 0 9.73 2.034a10.014 10.014 0 0 0-4.489 2.582c-3.898 3.898-3.898 10.243 0 14.143a9.936 9.936 0 0 0 7.072 2.93 9.93 9.93 0 0 0 7.07-2.929 10.007 10.007 0 0 0 2.583-4.491 1 1 0 0 0-1.224-1.224Zm-2.772 4.301a7.947 7.947 0 0 1-5.656 2.343 7.952 7.952 0 0 1-5.658-2.344c-3.118-3.119-3.118-8.195 0-11.314a7.923 7.923 0 0 1 2.06-1.483 10.027 10.027 0 0 0 2.89 7.848 9.973 9.973 0 0 0 7.848 2.891 8.037 8.037 0 0 1-1.484 2.059Z"
+              d="M20.742 13.045C20.0643 13.225 19.3662 13.3161 18.665 13.316C16.53 13.316 14.525 12.486 13.019 10.98C12.0301 9.98533 11.3191 8.74884 10.9569 7.39378C10.5948 6.03871 10.5941 4.61239 10.955 3.25698C11.0001 3.08752 10.9998 2.90918 10.9542 2.73985C10.9086 2.57053 10.8192 2.41618 10.6951 2.29229C10.571 2.16839 10.4165 2.07931 10.2471 2.03397C10.0777 1.98863 9.8994 1.98864 9.73 2.03398C8.03316 2.48617 6.48507 3.37661 5.241 4.61598C1.343 8.51398 1.343 14.859 5.241 18.759C6.16753 19.6907 7.26964 20.4294 8.48354 20.9323C9.69745 21.4352 10.999 21.6924 12.313 21.689C13.6266 21.6927 14.9279 21.4357 16.1415 20.9329C17.3551 20.4301 18.4569 19.6916 19.383 18.76C20.6233 17.5157 21.5142 15.9668 21.966 14.269C22.0109 14.0996 22.0105 13.9214 21.9649 13.7522C21.9193 13.583 21.8301 13.4287 21.7062 13.3048C21.5823 13.1809 21.428 13.0916 21.2588 13.0461C21.0896 13.0005 20.9114 13.0001 20.742 13.045V13.045ZM17.97 17.346C17.229 18.0911 16.3475 18.6818 15.3767 19.084C14.4058 19.4862 13.3649 19.6918 12.314 19.689C11.2628 19.6916 10.2215 19.4858 9.25033 19.0834C8.27916 18.6811 7.39739 18.0902 6.656 17.345C3.538 14.226 3.538 9.14998 6.656 6.03098C7.25851 5.42915 7.9541 4.9284 8.716 4.54798C8.60448 5.98704 8.80496 7.43322 9.30373 8.78767C9.8025 10.1421 10.5878 11.3729 11.606 12.396C12.6268 13.4174 13.8573 14.2048 15.2123 14.704C16.5673 15.2032 18.0146 15.4021 19.454 15.287C19.0715 16.0476 18.5706 16.7426 17.97 17.346V17.346Z"
               fill="currentColor"
             />
           </svg>
@@ -65,7 +65,39 @@ export default function HelloDarkness() {
           xmlns="http://www.w3.org/2000/svg"
         >
           <path
-            d="M12 18.14a.722.722 0 0 0-.722.722v2.166a.722.722 0 0 0 1.444 0v-2.166a.722.722 0 0 0-.722-.721ZM12 2.25a.722.722 0 0 0-.722.722v2.166a.722.722 0 0 0 1.444 0V2.972A.722.722 0 0 0 12 2.25ZM5.86 12a.722.722 0 0 0-.723-.722H2.972a.722.722 0 0 0 0 1.444h2.165A.722.722 0 0 0 5.86 12ZM21.028 11.278h-2.165a.722.722 0 0 0 0 1.444h2.165a.722.722 0 0 0 0-1.444ZM7.148 16.13a.72.72 0 0 0-.51.21l-1.533 1.534a.72.72 0 1 0 1.022 1.022l1.532-1.533a.724.724 0 0 0-.51-1.233ZM16.852 7.87a.72.72 0 0 0 .51-.21l1.533-1.533a.72.72 0 0 0 .211-.511.72.72 0 0 0-.722-.722.72.72 0 0 0-.51.21L16.34 6.639a.72.72 0 0 0-.211.51.72.72 0 0 0 .722.722ZM6.127 5.105a.72.72 0 0 0-.511-.211.72.72 0 0 0-.722.722.72.72 0 0 0 .21.51L6.638 7.66a.72.72 0 0 0 .511.211.72.72 0 0 0 .722-.722.72.72 0 0 0-.21-.51L6.126 5.105ZM17.363 16.34a.72.72 0 1 0-1.022 1.022l1.532 1.533a.72.72 0 0 0 1.022 0 .72.72 0 0 0 0-1.021l-1.532-1.533ZM12 7.5c-2.48 0-4.5 2.02-4.5 4.5s2.02 4.5 4.5 4.5 4.5-2.02 4.5-4.5-2.02-4.5-4.5-4.5Z"
+            d="M12 18.1406C11.6016 18.1406 11.2782 18.464 11.2782 18.8624V21.0281C11.2782 21.4265 11.6016 21.7499 12 21.7499C12.3985 21.7499 12.7219 21.4265 12.7219 21.0281V18.8624C12.7219 18.464 12.3985 18.1406 12 18.1406V18.1406Z"
+            fill="currentColor"
+          />
+          <path
+            d="M12 2.25006C11.6016 2.25006 11.2782 2.5735 11.2782 2.97194V5.13756C11.2782 5.536 11.6016 5.85944 12 5.85944C12.3985 5.85944 12.7219 5.536 12.7219 5.13756V2.97194C12.7219 2.5735 12.3985 2.25006 12 2.25006V2.25006Z"
+            fill="currentColor"
+          />
+          <path
+            d="M5.85936 12C5.85936 11.6015 5.53592 11.2781 5.13749 11.2781H2.97186C2.57342 11.2781 2.24999 11.6015 2.24999 12C2.24999 12.3984 2.57342 12.7218 2.97186 12.7218H5.13749C5.53592 12.7218 5.85936 12.3984 5.85936 12V12Z"
+            fill="currentColor"
+          />
+          <path
+            d="M21.0281 11.2781H18.8625C18.4641 11.2781 18.1406 11.6015 18.1406 12C18.1406 12.3984 18.4641 12.7218 18.8625 12.7218H21.0281C21.4266 12.7218 21.75 12.3984 21.75 12C21.75 11.6015 21.4266 11.2781 21.0281 11.2781V11.2781Z"
+            fill="currentColor"
+          />
+          <path
+            d="M7.14841 16.1298C6.95622 16.1298 6.77341 16.2048 6.63747 16.3407L5.10466 17.8735C4.96872 18.0094 4.89372 18.1923 4.89372 18.3844C4.89372 18.5766 4.96872 18.7594 5.10466 18.8954C5.2406 19.0313 5.42341 19.1063 5.6156 19.1063C5.80779 19.1063 5.9906 19.0313 6.12654 18.8954L7.65935 17.3626C7.9406 17.0813 7.9406 16.6219 7.65935 16.3407C7.52341 16.2048 7.3406 16.1298 7.14841 16.1298V16.1298Z"
+            fill="currentColor"
+          />
+          <path
+            d="M16.8516 7.87036C17.0437 7.87036 17.2266 7.79536 17.3625 7.65942L18.8953 6.12661C19.0312 5.99067 19.1062 5.80786 19.1062 5.61567C19.1062 5.42349 19.0312 5.24067 18.8953 5.10474C18.7594 4.9688 18.5766 4.8938 18.3844 4.8938C18.1922 4.8938 18.0094 4.9688 17.8734 5.10474L16.3406 6.63755C16.2047 6.77349 16.1297 6.9563 16.1297 7.14849C16.1297 7.34067 16.2047 7.52349 16.3406 7.65942C16.4766 7.79536 16.6594 7.87036 16.8516 7.87036V7.87036Z"
+            fill="currentColor"
+          />
+          <path
+            d="M6.12654 5.10474C5.9906 4.9688 5.80779 4.8938 5.6156 4.8938C5.42341 4.8938 5.2406 4.9688 5.10466 5.10474C4.96872 5.24067 4.89372 5.42349 4.89372 5.61567C4.89372 5.80786 4.96872 5.99067 5.10466 6.12661L6.63747 7.65942C6.77341 7.79536 6.95622 7.87036 7.14841 7.87036C7.3406 7.87036 7.52341 7.79536 7.65935 7.65942C7.79529 7.52349 7.87029 7.34067 7.87029 7.14849C7.87029 6.9563 7.79529 6.77349 7.65935 6.63755L6.12654 5.10474V5.10474Z"
+            fill="currentColor"
+          />
+          <path
+            d="M17.3625 16.3407C17.2266 16.2048 17.0437 16.1298 16.8516 16.1298C16.6594 16.1298 16.4766 16.2048 16.3406 16.3407C16.0594 16.6219 16.0594 17.0813 16.3406 17.3626L17.8734 18.8954C18.0094 19.0313 18.1922 19.1063 18.3844 19.1063C18.5766 19.1063 18.7594 19.0313 18.8953 18.8954C19.0312 18.7594 19.1062 18.5766 19.1062 18.3844C19.1062 18.1923 19.0312 18.0094 18.8953 17.8735L17.3625 16.3407V16.3407Z"
+            fill="currentColor"
+          />
+          <path
+            d="M12 7.5C9.52031 7.5 7.5 9.52031 7.5 12C7.5 14.4797 9.52031 16.5 12 16.5C14.4797 16.5 16.5 14.4797 16.5 12C16.5 9.52031 14.4797 7.5 12 7.5Z"
             fill="currentColor"
           />
         </svg>

diff --git a/src/components/Markdown/prism-theme.scss b/src/components/Markdown/prism-theme.scss
@@ -75,7 +75,6 @@ pre[class*='lang-'] {
 
 .token.deleted {
   color: #f79494;
-  user-select: none;
 }
 
 .token.operator,

diff --git a/src/components/NotificationBar/MessageBar.jsx b/src/components/NotificationBar/MessageBar.jsx
@@ -2,7 +2,7 @@ import CloseIcon from '../../styles/icons/cross.svg';
 import PropTypes from 'prop-types';
 import Content from './Notification.mdx';
 import { version, localStorageIsEnabled } from './NotificationBar';
-import { useTransition, animated, config } from 'react-spring/web';
+import { useTransition, animated, config } from 'react-spring';
 import { useEffect, useState } from 'react';
 
 MessageBar.propTypes = {