docs(en): merge webpack.js.org/master into webpack.js.org/cn @ 5e524df7

package.json

@@ -59,8 +59,7 @@
     "cypress:open": "cypress open",
     "cypress:run": "cypress run",
     "prettier": "prettier --write '**/*.{js,json,jsx,css,scss,md,mdx}'",
-    "prepare": "husky install",
-    "postinstall": "rimraf ./node_modules/.cache/webpack"
+    "prepare": "husky install && rimraf ./node_modules/.cache/webpack && yarn-deduplicate --strategy fewer"
   },
   "lint-staged": {
     "*.{js,jsx,md,mdx}": [
@@ -74,30 +73,30 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.18.9",
+    "@babel/core": "^7.18.10",
     "@babel/eslint-parser": "^7.18.9",
     "@babel/plugin-proposal-class-properties": "^7.17.12",
-    "@babel/preset-env": "^7.18.9",
+    "@babel/preset-env": "^7.18.10",
     "@babel/preset-react": "^7.18.6",
     "@mdx-js/loader": "^2.0.0-next.9",
     "@octokit/auth-action": "^2.0.0",
     "@octokit/rest": "^19.0.3",
-    "@parcel/css": "^1.12.0",
+    "@parcel/css": "^1.12.2",
     "@pmmmwh/react-refresh-webpack-plugin": "next",
     "@svgr/webpack": "^6.3.1",
-    "autoprefixer": "^10.4.7",
+    "autoprefixer": "^10.4.8",
     "babel-loader": "^8.2.5",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.1",
     "css-minimizer-webpack-plugin": "^4.0.0",
-    "cypress": "^10.3.1",
+    "cypress": "^10.4.0",
     "directory-tree": "^3.3.0",
     "directory-tree-webpack-plugin": "^1.0.3",
     "duplexer": "^0.1.1",
-    "eslint": "^8.20.0",
+    "eslint": "^8.21.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-cypress": "^2.12.1",
-    "eslint-plugin-mdx": "^2.0.1",
+    "eslint-plugin-mdx": "^2.0.2",
     "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "front-matter": "^4.0.2",
@@ -110,13 +109,13 @@
     "jest": "^28.1.3",
     "lint-staged": "^13.0.3",
     "lodash": "^4.17.21",
-    "markdownlint": "^0.26.0",
-    "markdownlint-cli": "^0.32.0",
+    "markdownlint": "^0.26.1",
+    "markdownlint-cli": "^0.32.1",
     "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.9",
+    "node-fetch": "^3.2.10",
     "npm-run-all": "^4.1.1",
     "postcss": "^8.4.14",
     "postcss-loader": "^7.0.1",
@@ -132,23 +131,24 @@
     "remark-html": "^15.0.1",
     "remark-refractor": "montogeek/remark-refractor",
     "rimraf": "^3.0.2",
-    "sass": "^1.53.0",
+    "sass": "^1.54.2",
     "sass-loader": "^13.0.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.1.6",
+    "tailwindcss": "^3.1.7",
     "tap-spot": "^1.1.2",
     "textlint": "^11.8.2",
     "textlint-rule-heading": "^1.0.10",
     "unist-util-visit": "^4.1.0",
-    "webpack": "^5.73.0",
+    "webpack": "^5.74.0",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.9.3",
     "webpack-merge": "^5.8.0",
-    "workbox-webpack-plugin": "^6.5.3"
+    "workbox-webpack-plugin": "^6.5.4",
+    "yarn-deduplicate": "^5.0.0"
   },
   "dependencies": {
     "@docsearch/react": "^3.0.0-alpha.50",
@@ -158,13 +158,13 @@
     "react-dom": "^17.0.2",
     "react-helmet-async": "^1.3.0",
     "react-router-dom": "^6.3.0",
-    "react-spring": "^9.5.1",
+    "react-spring": "^9.5.2",
     "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.3"
+    "workbox-window": "^6.5.4"
   },
   "resolutions": {
     "sitemap-static/minimist": "1.2.5",

src/content/guides/progressive-web-application.mdx

@@ -146,4 +146,8 @@ SW registered
 
 ## 结论 $#conclusion$
 
+<<<<<<< HEAD
 你已经使用 Workbox 项目构建了一个离线应用程序。开始进入将 web app 改造为 PWA 的旅程。你现在可能想要考虑下一步做什么。[这里](https://developers.google.com/web/progressive-web-apps/)是可以帮助到你解决下一步问题的比较不错的资源。
+=======
+You have built an offline app using the Workbox project. You've started the journey of turning your web app into a PWA. You may now want to think about taking things further. A good resource to help you with that can be found [here](https://web.dev/progressive-web-apps/).
+>>>>>>> 5e524df7076042ad2b1d16abdcf694da5235a938