merge

Author: weiyuan0609

.babelrc

@@ -1,17 +1,15 @@
 {
   "presets": [
-    "env",
-    "react"
+    "@babel/preset-env",
+    "@babel/preset-react"
   ],
   "plugins": [
-    "syntax-dynamic-import",
-    "transform-object-rest-spread",
-    "transform-class-properties"
+    "@babel/plugin-proposal-class-properties"
   ],
   "env": {
     "development": {
       "plugins": [
-        "react-hot-loader/babel"
+        "react-refresh/babel"
       ]
     }
   }

.eslintrc

@@ -1,7 +1,7 @@
 {
   "root": true,
   "extends": "eslint:recommended",
-  "parser": "babel-eslint",
+  "parser": "@babel/eslint-parser",
   "env": {
     "browser": true,
     "es6": true,

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,7 @@
 - [ ] Check the current issues to ensure you aren't creating a duplicate.
 - [ ] Consider making small typo fixes and such directly as pull requests.
 - [ ] For the voting application, go to https://github.com/webpack-contrib/voting-app.
+- [ ] For the document of Chinese translation（中文版文档), go to https://github.com/docschina/webpack.js.org.
 - [ ] For loader/plugin docs, consider opening an issue in the corresponding repository.
 - [ ] No existing issue? Go ahead and open a new one.
 - __Remove these instructions from your PR as they are for your eyes only.__

.github/workflows/main.yml

@@ -54,3 +54,4 @@ jobs:
           staticSrcPath: ./dist
           bucket: ${{ secrets.BUCKET }}
           region: ${{ secrets.REGION }}
+          forceFiles: ${{ secrets.FORCE_FILES }}  

.gitignore

@@ -12,3 +12,4 @@ package-lock.json
 internal-links.tap
 stats.json
 printable.md
+repositories/*.json

.travis.yml

@@ -1,49 +1,71 @@
+dist: bionic
 language: node_js
-node_js:
-  - "10.18.0"
+node_js: "12"
 
 cache:
   yarn: true
+  npm: false
   directories:
-    - node_modules
-    - dist
     - .cache
+    - repositories
 
 stages:
+  - Lint
+  - Test
   - Build
-  - Post-build
 
 jobs:
   fast_finish: true
 
   include:
-    - stage: Build
-      name: Lint and Build
-      before_install: npm install --global yarn
-      install:
-        - yarn
-        - yarn cypress install
-        - yarn cypress verify
+    - stage: Lint
+      name: Lint
+      env: CACHE_TYPE=lint
       script:
         - yarn lint:js || travis_terminate 1
         - yarn lint:markdown || travis_terminate 1
         - yarn lint:social || travis_terminate 1
-        - yarn cypress:ci || travis_terminate 1
-        - yarn build || travis_terminate 1
-        - yarn lint:links || travis_terminate 1
 
-    - stage: Build
+    - stage: Lint
       name: Proselint
       language: python
+      env: CACHE_TYPE=proselint
       python: 3.6
       cache:
+        yarn: false
+        npm: false
         pip: true
         directories:
           - $HOME/.cache
       install: pip install -r requirements.txt
       script: cp .proselintrc ~/ && proselint src/content
 
-    - stage: Post-build
-      name: Deploy
+    - stage: Test
+      name: Cypress
+      env: CACHE_TYPE=lint
+      node_js: "10"
+      install:
+        - yarn
+        - yarn cypress install
+        - yarn cypress verify
+      script:
+        - yarn fetch:supporters
+        - yarn fetch:starter-kits
+        - yarn cypress:ci || travis_terminate 1
+
+    - stage: Build
+      name: Build
+      if: branch != master OR type NOT IN (push, cron)
+      env: CACHE_TYPE=build
+      script:
+        - yarn build || travis_terminate 1
+        - yarn lint:links || travis_terminate 1
+
+    - stage: Build
+      name: Build and Deploy
       if: branch = master AND type IN (push, cron)
-      script: bash ./src/scripts/deploy.sh
+      env: CACHE_TYPE=build
+      script:
+        - yarn build || travis_terminate 1
+        - yarn lint:links || travis_terminate 1
+        - bash ./src/scripts/deploy.sh

package.json

@@ -27,27 +27,30 @@
     "clean-dist": "rimraf ./dist",
     "clean-printable": "rimraf src/content/**/printable.md",
     "preclean": "run-s clean-dist clean-printable",
-    "clean": "rimraf src/content/**/_*.md src/**/_*.json",
-    "start": "npm run clean-dist && cross-env NODE_ENV=development webpack-dev-server --config webpack.dev.js --env.dev",
-    "update-repos": "node src/utilities/fetch-package-repos.js",
+    "clean": "rimraf src/content/**/_*.md src/**/_*.json repositories/*.json",
+    "start": "npm run clean-dist && cross-env NODE_ENV=development webpack-dev-server --config webpack.dev.js --env.dev --progress",
     "content": "node src/scripts/build-content-tree.js ./src/content ./src/_content.json",
     "bundle-analyze": "run-s clean fetch printable content && cross-env NODE_ENV=production webpack --config webpack.ssg.js && run-s clean-printable content && cross-env NODE_ENV=production webpack --config webpack.prod.js  --profile --json > stats.json && webpack-bundle-analyzer stats.json",
+    "fetch-repos": "node src/utilities/fetch-package-repos.js",
     "fetch": "run-p fetch:*",
     "fetch:readmes": "node src/utilities/fetch-package-readmes.js",
     "fetch:supporters": "node src/utilities/fetch-supporters.js",
     "fetch:starter-kits": "node src/utilities/fetch-starter-kits.js",
     "prebuild": "npm run clean",
-    "build": "run-s fetch:supporters fetch:starter-kits printable content && cross-env NODE_ENV=production webpack --config webpack.ssg.js && run-s clean-printable content && cross-env NODE_ENV=production webpack --config webpack.prod.js",
+    "build": "run-s fetch printable content && cross-env NODE_ENV=production webpack --config webpack.ssg.js && run-s clean-printable content && cross-env NODE_ENV=production webpack --config webpack.prod.js",
     "postbuild": "npm run sitemap",
     "build-test": "npm run build && http-server dist/",
     "test": "npm run lint",
     "lint": "run-s lint:*",
-    "lint:js": "eslint src --ext .js,.jsx --cache true --cache-location .cache/.eslintcache",
-    "lint:markdown": "markdownlint --rules markdownlint-rule-emphasis-style --config ./.markdownlint.json *.md ./src/content/**/*.md --ignore './src/content/**/_*.md'",
+    "lint:js": "npm run lint-js src",
+    "lint-js": "eslint --ext .js,.jsx,.md --cache --cache-location .cache/.eslintcache",
+    "lint:markdown": "npm run lint-markdown *.md ./src/content/**/*.md",
+    "lint-markdown": "markdownlint --rules markdownlint-rule-emphasis-style --config ./.markdownlint.json --ignore './src/content/**/_*.md'",
     "lint:social": "alex . -q",
     "lint:prose": "cp .proselintrc ~/ && proselint src/content",
-    "lint:links": "hyperlink -c 8 -r dist/index.html --canonicalroot https://webpack.js.org/ -i --skip https://img.shields.io --skip **/printable** --skip https://david-dm.org --skip https://codecov.io/gh --skip 'content-type-mismatch https://travis-ci.org' > internal-links.tap; cat internal-links.tap | tap-spot",
+    "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",
@@ -65,8 +68,11 @@
     }
   },
   "lint-staged": {
-    "*.{js,jsx}": [
-      "npm run lint:js"
+    "*.{js,jsx,md}": [
+      "npm run lint-js"
+    ],
+    "*.md": [
+      "npm run lint-markdown"
     ]
   },
   "bundlesize": [
@@ -76,108 +82,104 @@
     }
   ],
   "devDependencies": {
-    "@mdx-js/loader": "0.15.7",
-    "@mdx-js/mdx": "0.15.7",
-    "@octokit/rest": "^16.27.1",
+    "@babel/core": "^7.11.6",
+    "@babel/eslint-parser": "^7.11.5",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/preset-env": "^7.11.5",
+    "@babel/preset-react": "^7.10.4",
+    "@mdx-js/loader": "^1.6.16",
+    "@octokit/rest": "^18.0.5",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.4.2",
     "alex": "^5.1.0",
-    "autoprefixer": "^7.2.3",
-    "babel-core": "^6.26.0",
-    "babel-eslint": "^7.2.3",
-    "babel-loader": "^7.1.2",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-preset-env": "^1.6.0",
-    "babel-preset-react": "^6.24.1",
-    "bundlesize": "^0.17.1",
-    "copy-webpack-plugin": "4.5.2",
-    "cross-env": "5.2.0",
-    "css-loader": "^0.28.10",
-    "cypress": "^4.5.0",
-    "directory-tree": "2.2.0",
-    "directory-tree-webpack-plugin": "0.3",
+    "autoprefixer": "^9.8.6",
+    "babel-loader": "^8.1.0",
+    "bundlesize": "^0.18.0",
+    "copy-webpack-plugin": "^6.1.0",
+    "cross-env": "^7.0.2",
+    "css-loader": "^4.3.0",
+    "css-minimizer-webpack-plugin": "^1.1.3",
+    "cypress": "^5.3.0",
+    "directory-tree": "^2.2.4",
+    "directory-tree-webpack-plugin": "^1.0.2",
     "docschina-remark-slugger": "^0.1.4",
     "duplexer": "^0.1.1",
-    "eslint": "4.19.1",
-    "eslint-loader": "^2.0.0",
+    "eslint": "^7.8.1",
     "eslint-plugin-cypress": "^2.10.3",
-    "eslint-plugin-markdown": "1.0.0-rc.0",
-    "file-loader": "^1.1.11",
-    "fontgen-loader": "git://github.com/EugeneHlushko/fontgen-loader.git#0.1.3",
-    "front-matter": "^2.3.0",
-    "gh-pages": "^1.0.0",
-    "html-webpack-plugin": "^3.2.0",
-    "html-webpack-template": "^6.1.0",
-    "http-server": "^0.10.0",
-    "husky": "^1.0.0-rc.8",
-    "hyperlink": "^4.4.0",
-    "jest": "^23.6.0",
-    "lint-staged": "^8.1.0",
-    "loader-utils": "^1.1.0",
+    "eslint-plugin-markdown": "^1.0.2",
+    "file-loader": "^6.1.0",
+    "fontgen-loader": "git://github.com/chenxsan/fontgen-loader.git#bugfix/fix-this-exec",
+    "front-matter": "^4.0.2",
+    "gh-pages": "^3.1.0",
+    "html-loader": "^1.3.0",
+    "html-webpack-plugin": "^4.4.1",
+    "http-server": "^0.12.3",
+    "husky": "^4.3.0",
+    "hyperlink": "^4.5.3",
+    "jest": "^26.4.2",
+    "lint-staged": "^10.3.0",
     "lodash": "^4.17.19",
-    "markdown-loader": "^4.0.0",
-    "markdownlint": "^0.11.0",
-    "markdownlint-cli": "^0.13.0",
+    "markdownlint": "^0.20.4",
+    "markdownlint-cli": "^0.23.2",
     "markdownlint-rule-emphasis-style": "^1.0.0",
-    "marked": "0.6.1",
-    "mini-css-extract-plugin": "^0.5.0",
+    "mini-css-extract-plugin": "^1.0.0",
     "minimist": "1.2.3",
-    "mkdirp": "^0.5.1",
+    "mkdirp": "^1.0.4",
     "modularscale-sass": "^3.0.3",
     "node-sass": "^4.5.3",
     "npm-run-all": "^4.1.1",
-    "offline-plugin": "^5.0.7",
-    "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "postcss-loader": "^2.1.3",
-    "redirect-webpack-plugin": "^0.1.1",
-    "remark": "^10.0.1",
-    "remark-autolink-headings": "5.2.1",
+    "postcss": "^7.0.32",
+    "postcss-loader": "^4.0.1",
+    "react-refresh": "^0.8.3",
+    "redirect-webpack-plugin": "^1.0.0",
+    "remark": "^12.0.1",
+    "remark-autolink-headings": "^6.0.1",
     "remark-custom-blockquotes": "1.0.0",
     "remark-extract-anchors": "1.1.1",
-    "remark-loader": "^0.3.0",
-    "remark-refractor": "1.1.0",
+    "remark-html": "^12.0.0",
+    "remark-loader": "^1.0.0",
+    "remark-refractor": "git://github.com/montogeek/remark-refractor.git",
     "remark-responsive-tables": "1.0.0",
-    "remark-slug": "^5.0.0",
+    "remark-slug": "^6.0.0",
     "request-promise": "4.2.4",
-    "rimraf": "^2.6.2",
-    "sass-loader": "^6.0.6",
-    "sirv-cli": "^0.1.2",
+    "rimraf": "^3.0.2",
+    "sass-loader": "^10.0.2",
+    "sirv-cli": "^1.0.6",
     "sitemap-static": "^0.4.2",
     "start-server-and-test": "^1.11.0",
     "static-site-generator-webpack-plugin": "^3.4.1",
-    "style-loader": "^0.18.2",
+    "style-loader": "^2.0.0",
     "tap-spot": "^1.1.1",
-    "terser-webpack-plugin": "^2.3.5",
+    "terser-webpack-plugin": "^4.1.0",
     "textlint": "^11.6.3",
     "textlint-rule-heading": "^1.0.10",
     "through2": "^2.0.3",
     "uglifyjs-webpack-plugin": "^1.1.6",
-    "webpack": "^4.42.0",
+    "webpack": "^5.0.0",
     "webpack-bundle-analyzer": "^3.3.2",
     "webpack-cli": "^3.2.3",
     "webpack-dev-server": "^3.2.1",
-    "webpack-merge": "^4.1.0"
+    "webpack-merge": "^5.1.4",
+    "workbox-webpack-plugin": "^5.1.4"
   },
   "dependencies": {
-    "ajv": "^5.5.2",
     "docsearch.js": "^2.5.2",
     "gitter-sidecar": "^1.2.3",
-    "handlebars": "4.5.3",
     "javascriptstuff-db": "^1.12.0",
     "lodash.throttle": "^4.1.1",
+    "path-browserify": "^1.0.1",
     "prop-types": "^15.7.2",
     "react": "^16.8.6",
     "react-banner": "^1.0.0-rc.0",
     "react-document-title": "^2.0.3",
     "react-dom": "^16.8.6",
     "react-g-analytics": "0.4.2",
-    "react-hot-loader": "^4.0.0-beta.12",
-    "react-markdown": "4.2.2",
-    "react-router-dom": "^4.2.2",
-    "react-tiny-popover": "3.4.2",
+    "react-router-dom": "^5.2.0",
+    "react-tiny-popover": "5",
     "react-visibility-sensor": "^5.0.2",
     "webpack-pwa-manifest": "^4.0.0",
-    "webpack.vote": "https://github.com/webpack/voting-app.git",
-    "whatwg-fetch": "^2.0.3"
+    "webpack.vote": "https://github.com/webpack/voting-app.git"
+  },
+  "resolutions": {
+    "remark-responsive-tables": "git://github.com/chenxsan/remark-responsive-tables.git#bugfix/fix-empty-head"
   }
 }