Merge branch 'cn' into sync-d054d465-1

Author: awxiaoxian2020

package.json

@@ -28,37 +28,26 @@
     "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 --node-env development",
+    "start": "npm run clean-dist && webpack serve --config webpack.dev.mjs --env dev --progress --define-process-env-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 --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",
+    "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",
     "fetch-repos": "node src/utilities/fetch-package-repos.mjs",
     "fetch": "run-p fetch:*",
     "fetch:readmes": "node src/utilities/fetch-package-readmes.mjs",
-<<<<<<< HEAD
     "fetch:supporters": "node src/utilities/fetch-supporters.mjs",
-=======
->>>>>>> d054d4656cbfb5228fc96f5de26d4f0ce349f742
     "prebuild": "npm run clean",
-    "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",
+    "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",
     "postbuild": "npm run sitemap",
     "build-test": "npm run build && http-server --port 4200 dist/",
     "serve-dist": "http-server --port 4200 dist/",
     "test": "npm run lint",
     "lint": "run-s lint:*",
     "lint:js": "npm run lint-js .",
     "lint-js": "eslint --cache --cache-location .cache/.eslintcache",
-<<<<<<< HEAD
     "lint:markdown": "npm run lint-markdown '**/*.{md,mdx}'",
     "lint-markdown": "markdownlint --config ./.markdownlint.json",
-=======
-    "lint:markdown": "npm run lint-markdown *.md",
-    "lint-markdown": "markdownlint --config ./.markdownlint.json --ignore '.vale/**/*.md' --ignore '.github/**/*.md'",
->>>>>>> d054d4656cbfb5228fc96f5de26d4f0ce349f742
     "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",
@@ -81,193 +70,97 @@
     ]
   },
   "devDependencies": {
-<<<<<<< HEAD
-    "@babel/core": "^7.19.6",
-    "@babel/eslint-parser": "^7.19.1",
+    "@babel/core": "^7.22.19",
+    "@babel/eslint-parser": "^7.22.15",
     "@babel/plugin-proposal-class-properties": "^7.17.12",
-    "@babel/preset-env": "^7.19.4",
-    "@babel/preset-react": "^7.18.6",
-    "@mdx-js/loader": "^2.3.0",
-    "@octokit/auth-action": "^2.0.2",
-    "@octokit/rest": "^19.0.5",
+    "@babel/preset-env": "^7.22.15",
+    "@babel/preset-react": "^7.22.15",
+    "@mdx-js/loader": "^2.0.0-next.9",
+    "@octokit/auth-action": "^4.0.0",
+    "@octokit/rest": "^20.0.1",
     "@pmmmwh/react-refresh-webpack-plugin": "next",
-    "@svgr/webpack": "^6.5.1",
-    "autoprefixer": "^10.4.13",
-    "babel-loader": "^9.0.0",
+    "@svgr/webpack": "^8.1.0",
+    "autoprefixer": "^10.4.15",
+    "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",
-    "css-loader": "^6.7.1",
-    "css-minimizer-webpack-plugin": "^4.2.2",
-    "cypress": "^12.7.0",
-    "directory-tree": "^3.3.1",
+    "css-loader": "^6.8.1",
+    "css-minimizer-webpack-plugin": "^5.0.1",
+    "cypress": "^13.2.0",
+    "directory-tree": "^3.5.1",
     "directory-tree-webpack-plugin": "^1.0.3",
     "duplexer": "^0.1.1",
-    "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": "^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-plugin-react-hooks": "^4.6.0",
     "front-matter": "^4.0.2",
     "github-slugger": "^2.0.0",
-    "html-loader": "^2.1.2",
-    "html-webpack-plugin": "^5.5.0",
+    "html-webpack-plugin": "^5.5.3",
     "http-server": "^14.1.1",
-    "husky": "^8.0.1",
+    "husky": "^8.0.3",
     "hyperlink": "^5.0.4",
-    "jest": "^29.2.2",
-    "lightningcss": "^1.19.0",
-    "lint-staged": "^13.0.3",
+    "jest": "^29.7.0",
+    "lightningcss": "^1.21.8",
+    "lint-staged": "^14.0.1",
     "lodash": "^4.17.21",
-    "markdownlint": "^0.26.2",
-    "markdownlint-cli": "^0.32.2",
-    "mdast-util-to-string": "^3.1.0",
-    "mini-css-extract-plugin": "^2.7.2",
-    "mkdirp": "^1.0.4",
+    "markdownlint-cli": "^0.36.0",
+    "mdast-util-to-string": "^4.0.0",
+    "mini-css-extract-plugin": "^2.7.6",
+    "mkdirp": "^3.0.1",
     "modularscale-sass": "^3.0.3",
-    "node-fetch": "^3.2.10",
     "npm-run-all": "^4.1.1",
-    "postcss": "^8.4.18",
-    "postcss-loader": "^7.0.1",
-    "prettier": "^2.7.1",
+    "postcss": "^8.4.29",
+    "postcss-loader": "^7.3.3",
+    "prettier": "^3.0.3",
     "react-refresh": "^0.14.0",
-=======
-    "@babel/core": "^7.16.0",
-    "@babel/eslint-parser": "^7.16.3",
-    "@babel/plugin-proposal-class-properties": "^7.12.1",
-    "@babel/preset-env": "^7.16.4",
-    "@babel/preset-react": "^7.16.0",
-    "@mdx-js/loader": "^2.0.0-next.9",
-    "@octokit/auth-action": "^1.3.3",
-    "@octokit/rest": "^18.12.0",
-    "@pmmmwh/react-refresh-webpack-plugin": "next",
-    "@svgr/webpack": "^6.1.1",
-    "autoprefixer": "^10.4.0",
-    "babel-loader": "^8.2.3",
-    "copy-webpack-plugin": "^10.0.0",
-    "css-loader": "^6.5.1",
-    "css-minimizer-webpack-plugin": "^3.2.0",
-    "cypress": "^9.1.1",
-    "directory-tree": "^3.0.1",
-    "directory-tree-webpack-plugin": "^1.0.3",
-    "duplexer": "^0.1.1",
-    "eslint": "^8.4.1",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-cypress": "^2.12.1",
-    "eslint-plugin-mdx": "^1.16.0",
-    "eslint-plugin-react": "^7.27.1",
-    "eslint-plugin-react-hooks": "^4.3.0",
-    "front-matter": "^4.0.2",
-    "github-slugger": "^1.3.0",
-    "html-loader": "^2.1.2",
-    "html-webpack-plugin": "^5.5.0",
-    "http-server": "^14.0.0",
-    "husky": "^7.0.4",
-    "hyperlink": "^5.0.3",
-    "jest": "^27.4.3",
-    "lint-staged": "^12.1.2",
-    "lodash": "^4.17.21",
-    "markdownlint": "^0.24.0",
-    "markdownlint-cli": "^0.30.0",
-    "mdast-util-to-string": "^1.1.0",
-    "mini-css-extract-plugin": "^2.4.5",
-    "mkdirp": "^1.0.4",
-    "modularscale-sass": "^3.0.3",
-    "node-fetch": "^3.1.0",
-    "npm-run-all": "^4.1.1",
-    "postcss": "^8.4.4",
-    "postcss-loader": "^6.2.1",
-    "prettier": "^2.5.1",
-    "react-refresh": "^0.11.0",
->>>>>>> d054d4656cbfb5228fc96f5de26d4f0ce349f742
     "redirect-webpack-plugin": "^1.0.0",
-    "remark": "^14.0.2",
+    "remark": "^14.0.3",
     "remark-autolink-headings": "7.0.1",
-    "remark-emoji": "^3.0.2",
+    "remark-emoji": "^4.0.0",
     "remark-extract-anchors": "1.1.1",
     "remark-frontmatter": "^4.0.1",
     "remark-gfm": "^1.0.0",
-<<<<<<< HEAD
-    "remark-html": "^15.0.1",
+    "remark-html": "^15.0.2",
     "remark-refractor": "montogeek/remark-refractor",
-    "rimraf": "^3.0.2",
-    "sass": "^1.55.0",
-    "sass-loader": "^13.1.0",
+    "rimraf": "^5.0.1",
+    "sass": "^1.67.0",
+    "sass-loader": "^13.3.2",
     "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.2.1",
+    "style-loader": "^3.3.3",
+    "tailwindcss": "^3.3.3",
     "tap-spot": "^1.1.2",
-    "textlint": "^13.3.1",
-    "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"
+    "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"
   },
   "dependencies": {
     "@docsearch/react": "^3.0.0-alpha.50",
-=======
-    "remark-html": "^15.0.0",
-    "remark-refractor": "montogeek/remark-refractor",
-    "remark-slug": "^7.0.1",
-    "rimraf": "^3.0.2",
-    "sass": "^1.44.0",
-    "sass-loader": "^12.4.0",
-    "sirv-cli": "^1.0.14",
-    "sitemap-static": "^0.4.2",
-    "start-server-and-test": "^1.14.0",
-    "static-site-generator-webpack-plugin": "^3.4.1",
-    "style-loader": "^3.3.1",
-    "tailwindcss": "^3.0.0",
-    "tap-spot": "^1.1.1",
-    "textlint": "^11.8.2",
-    "textlint-rule-heading": "^1.0.10",
-    "unist-util-visit": "^4.1.0",
-    "webpack": "^5.65.0",
-    "webpack-bundle-analyzer": "^4.5.0",
-    "webpack-cli": "^4.9.1",
-    "webpack-dev-server": "^4.6.0",
-    "webpack-merge": "^5.8.0",
-    "workbox-webpack-plugin": "^6.4.2"
-  },
-  "dependencies": {
-    "@docsearch/react": "^3.0.0-alpha.42",
->>>>>>> d054d4656cbfb5228fc96f5de26d4f0ce349f742
+    "@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",
-<<<<<<< HEAD
     "react-helmet-async": "^1.3.0",
-    "react-router-dom": "^6.4.2",
-    "react-spring": "^9.5.5",
+    "react-router-dom": "^6.16.0",
     "react-tiny-popover": "5",
     "react-use": "^17.4.0",
     "react-visibility-sensor": "^5.0.2",
     "webpack-pwa-manifest": "^4.3.0",
-    "webpack.vote": "https://github.com/webpack/voting-app.git",
-    "workbox-window": "^6.5.4"
-=======
-    "react-g-analytics": "0.4.2",
-    "react-helmet-async": "^1.2.2",
-    "react-router-dom": "^5.3.0",
-    "react-spring": "^9.3.2",
-    "react-tiny-popover": "5",
-    "react-use": "^17.3.1",
-    "react-visibility-sensor": "^5.0.2",
-    "webpack-pwa-manifest": "^4.3.0",
-    "webpack.vote": "https://github.com/webpack/voting-app.git",
-    "workbox-window": "^6.4.2"
->>>>>>> d054d4656cbfb5228fc96f5de26d4f0ce349f742
+    "workbox-window": "^7.0.0"
   },
   "resolutions": {
     "sitemap-static/minimist": "1.2.5",
     "ini": "1.3.7",
-    "eval": "^0.1.5"
+    "eval": "^0.1.5",
+    "markdownlint-cli/markdownlint": "^0.27.0"
   }
 }

src/content/api/normalmodulefactory-hooks.mdx

@@ -50,23 +50,23 @@ NormalModuleFactory.hooks.someHook.for('identifier').tap(/* ... */);
 
 - 回调参数：`resolveData`
 
-### resolveForScheme $#resolveForScheme$
+### resolveForScheme $#resolveforscheme$
 
 `AsyncSeriesBailHook`
 
 在解析符合统一资源标志符方案(URI)的请求之前调用。
 
 - 回调参数：`resolveData`
 
-### afterResolve $#afterResolve$
+### afterResolve $#afterresolve$
 
 `AsyncSeriesBailHook`
 
 在请求解析后调用。
 
 - 回调参数：`resolveData`
 
-### createModule $#createModule$
+### createModule $#createmodule$
 
 `AsyncSeriesBailHook`
 
@@ -82,7 +82,7 @@ NormalModuleFactory.hooks.someHook.for('identifier').tap(/* ... */);
 
 - 回调参数：`module` `createData` `resolveData`
 
-### createParser $#createParser$
+### createParser $#createparser$
 
 `HookMap<SyncBailHook>`
 
@@ -112,7 +112,7 @@ NormalModuleFactory.hooks.someHook.for('identifier').tap(/* ... */);
 6. `webassembly/async`
 7. `asset`
 
-### createGenerator $#createGenerator$
+### createGenerator $#creategenerator$
 
 `HookMap<SyncBailHook>`