docs(en): merging all conflicts

Author: docschina-bot

.github/CONTRIBUTING.md

@@ -28,7 +28,9 @@ will do this automatically. This step pulls in documentation for loaders/plugins
 in separate repositories such as the ones found in the [webpack-contrib][4] organization.
 See the `package.json` for the full list of `scripts`.
 
-> Note that **Node 12.x** or above is required for the build process to run properly.
+> **Note**
+>
+> **Node v14.20** or above is required for the build process to run properly.
 
 ## Contributor License Agreement
 

.github/workflows/cancel.yml

@@ -0,0 +1,13 @@
+name: Cancel
+on:
+  workflow_run:
+    workflows: ["Ensure PR"]
+    types:
+      - requested
+jobs:
+  cancel:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: styfle/cancel-workflow-action@0.10.1
+      with:
+        workflow_id: ${{ github.event.workflow.id }}

.github/workflows/dependency-review.yml

@@ -0,0 +1,14 @@
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v2

.github/workflows/testing.yml

@@ -116,6 +116,7 @@ jobs:
       - name: Cypress run
         uses: cypress-io/github-action@v4
         with:
+          browser: chrome
           config-file: cypress.config.js
           build: yarn build
           start: yarn serve-dist

.markdownlint.json

@@ -3,13 +3,17 @@
   "MD002": false,
   "MD004": { "style": "dash" },
   "MD007": { "indent": 2 },
-  "MD013": { "line_length": 600 },
+  "MD013": { "line_length": 600, "code_blocks": false },
+  "MD024": {
+    "siblings_only": true
+  },
   "MD026": false,
   "MD029": { "style": "ordered" },
   "MD033": false,
   "MD034": false,
   "MD036": false,
   "MD041": false,
+  "MD053": false,
   "no-hard-tabs": false,
   "whitespace": false
 }

.markdownlintignore

@@ -0,0 +1 @@
+node_modules

package.json

@@ -44,8 +44,8 @@
     "lint": "run-s lint:*",
     "lint:js": "npm run lint-js .",
     "lint-js": "eslint --cache --cache-location .cache/.eslintcache",
-    "lint:markdown": "npm run lint-markdown *.md",
-    "lint-markdown": "markdownlint --config ./.markdownlint.json --ignore '.vale/**/*.md' --ignore '.github/**/*.md'",
+    "lint:markdown": "npm run lint-markdown '**/*.{md,mdx}'",
+    "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/*",
@@ -57,56 +57,60 @@
     "printable": "node ./src/scripts/concatenate-docs.mjs",
     "jest": "NODE_OPTIONS=--experimental-vm-modules jest --config=jest.config.mjs",
     "cypress:open": "cypress open",
-    "cypress:run": "cypress run",
+    "cypress:run": "cypress run --browser chrome",
     "prettier": "prettier --write '**/*.{js,json,jsx,css,scss,md,mdx}'",
     "prepare": "husky install && rimraf ./node_modules/.cache/webpack && yarn-deduplicate --strategy fewer"
   },
   "lint-staged": {
     "*.{js,jsx,md,mdx}": [
       "npm run lint-js"
     ],
-    "*.md": [
+    "*.{md,mdx}": [
       "npm run lint-markdown"
     ],
     "*.{js,jsx,css,scss,md,mdx,json}": [
       "prettier --write"
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.19.1",
+    "@babel/core": "^7.19.6",
     "@babel/eslint-parser": "^7.19.1",
     "@babel/plugin-proposal-class-properties": "^7.17.12",
-    "@babel/preset-env": "^7.19.1",
+    "@babel/preset-env": "^7.19.4",
     "@babel/preset-react": "^7.18.6",
     "@mdx-js/loader": "^2.0.0-next.9",
-    "@octokit/auth-action": "^2.0.1",
-    "@octokit/rest": "^19.0.4",
+    "@octokit/auth-action": "^2.0.2",
+    "@octokit/rest": "^19.0.5",
     "@pmmmwh/react-refresh-webpack-plugin": "next",
-    "@svgr/webpack": "^6.3.1",
-    "autoprefixer": "^10.4.11",
-    "babel-loader": "^8.2.5",
+    "@svgr/webpack": "^6.5.1",
+    "autoprefixer": "^10.4.13",
+    "babel-loader": "^9.0.0",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.1",
-    "css-minimizer-webpack-plugin": "^4.1.0",
-    "cypress": "^10.7.0",
+    "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.23.1",
+    "eslint": "^8.26.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-cypress": "^2.12.1",
-    "eslint-plugin-mdx": "^2.0.4",
-    "eslint-plugin-react": "^7.31.8",
+    "eslint-plugin-mdx": "^2.0.5",
+    "eslint-plugin-react": "^7.31.10",
     "eslint-plugin-react-hooks": "^4.6.0",
     "front-matter": "^4.0.2",
+<<<<<<< HEAD
     "github-slugger": "^1.4.0",
     "html-loader": "^2.1.2",
+=======
+    "github-slugger": "^2.0.0",
+>>>>>>> 1bc7704750b8b2b27a168a9afc1bf9f070745f0e
     "html-webpack-plugin": "^5.5.0",
     "http-server": "^14.1.1",
     "husky": "^8.0.1",
     "hyperlink": "^5.0.4",
-    "jest": "^29.0.3",
-    "lightningcss": "^1.15.1",
+    "jest": "^29.2.2",
+    "lightningcss": "^1.16.0",
     "lint-staged": "^13.0.3",
     "lodash": "^4.17.21",
     "markdownlint": "^0.26.2",
@@ -117,7 +121,7 @@
     "modularscale-sass": "^3.0.3",
     "node-fetch": "^3.2.10",
     "npm-run-all": "^4.1.1",
-    "postcss": "^8.4.16",
+    "postcss": "^8.4.18",
     "postcss-loader": "^7.0.1",
     "prettier": "^2.7.1",
     "react-refresh": "^0.14.0",
@@ -131,21 +135,21 @@
     "remark-html": "^15.0.1",
     "remark-refractor": "montogeek/remark-refractor",
     "rimraf": "^3.0.2",
-    "sass": "^1.54.9",
-    "sass-loader": "^13.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.1",
-    "tailwindcss": "^3.1.8",
+    "tailwindcss": "^3.2.1",
     "tap-spot": "^1.1.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.6.1",
+    "webpack-bundle-analyzer": "^4.7.0",
     "webpack-cli": "^4.10.0",
-    "webpack-dev-server": "^4.11.0",
+    "webpack-dev-server": "^4.11.1",
     "webpack-merge": "^5.8.0",
     "workbox-webpack-plugin": "^6.5.4",
     "yarn-deduplicate": "^6.0.0"
@@ -157,8 +161,8 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-helmet-async": "^1.3.0",
-    "react-router-dom": "^6.4.0",
-    "react-spring": "^9.5.4",
+    "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",

src/components/Configuration/Configuration.jsx

@@ -1,5 +1,5 @@
 // Import External Dependencies
-import { Children, isValidElement, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { useLocation } from 'react-router-dom';
 
@@ -9,7 +9,6 @@ import Markdown from '../Markdown/Markdown';
 import Contributors from '../Contributors/Contributors';
 import Translators from '../Translators/Translators';
 import { PlaceholderString } from '../Placeholder/Placeholder';
-import { Pre } from '../Configuration/Configuration';
 import AdjacentPages from './AdjacentPages';
 
 // Load Styling
@@ -95,16 +94,6 @@ export default function Page(props) {
 
   if (typeof content === 'function') {
     contentRender = content({}).props.children;
-    contentRender = Children.map(contentRender, (child) => {
-      if (isValidElement(child)) {
-        if (child.props.mdxType === 'pre') {
-          // eslint-disable-next-line
-          return <Pre children={child.props.children} />;
-        }
-      }
-
-      return child;
-    });
   } else {
     contentRender = (
       <div

src/components/Page/Page.jsx

@@ -648,7 +648,7 @@ module.exports = function (source) {
 
 这个模块将获取像下面的 bundle：
 
-```
+```text
 /***/ "./src/loader.js!./src/lib.js":
 /*!************************************!*\
   !*** ./src/loader.js!./src/lib.js ***!
@@ -725,7 +725,10 @@ module.exports = function (source) {
   if (STYLES_REGEXP.test(source)) {
     source = source.replace(STYLES_REGEXP, '');
     return `import ${JSON.stringify(
-      this.utils.contextify(this.context || this.rootContext, `${this.resource}.css!=!${getStylesLoader}!${this.remainingRequest}`)
+      this.utils.contextify(
+        this.context || this.rootContext,
+        `${this.resource}.css!=!${getStylesLoader}!${this.remainingRequest}`
+      )
     )};${source}`;
   }
   return source;