Merge branch 'master' into patch-1

Author: mszczepanczyk

.github/CONTRIBUTING.md

@@ -1,14 +1,14 @@
 Contributing
 ------------
 
-From adding an issue for a documentation suggestion to creating a pull request: every
+From opening an issue for a documentation suggestion to creating a pull request: every
 contribution is appreciated and welcome. If you're planning to implement a new section or
 page please create an issue first.
 
 
 ## Setup
 
-Start by ensuring you have Node installed and forking the repository:
+Start by ensuring that you have Node.js installed and forking the repository:
 
 - Install [Node.js][1] if you have not already.
 - Fork the **webpack.js.org** repo from [the main repository][2].
@@ -30,7 +30,7 @@ See the `package.json` for the full list of `scripts`.
 
 > Note that a __Python version between v2.5.0 and 3.0.0__ is required for the [proselint][12] dependency.
 
-> Although __Yarn__ is not required to work with webpack docs, the core team is using it more extensively. If you prefer to use Yarn make sure you [got it installed][13] and run `yarn` to pull all dependencies, `yarn build` to build the project, or `yarn start` to start development server.
+> Although __Yarn__ is not required to work with webpack docs, the core team is using it more extensively. If you prefer to use Yarn make sure that you [get it installed][13] and run `yarn` to pull all dependencies, `yarn build` to build the project, or `yarn start` to start the development server.
 
 > On Debian and Ubuntu operating systems you may have to use `node >= 7.0.0` to avoid build errors with `node-sass`. Please note that we don't officially support building on these systems.
 

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+open_collective: webpack
+

.github/ISSUE_TEMPLATE/Documentation_request.md

@@ -3,14 +3,16 @@ name: Documentation request
 about: Create a documentation request for a new feature or functionality change.
 ---
 
-**Feature to document**
+__Feature to document__
 
 <!-- Name of the feature(s) and a link to related pull request of the feature implementation. -->
 
-**Author(s)**
+__Author(s)__
 
 <!-- Mention feature author(s) in order to know who is assignable for review outside of the documentation team. -->
 
-**Additional information**
+__Additional information__
 
 <!-- Please provide any additional information that is required in order to document the feature in the best possible way or say N/A if linked PR has more than enough details. -->
+
+[ ] I am willing to work on this issue and submit a pull request.

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,4 +7,4 @@ _describe your changes..._
 
 
 [1]: https://cla.js.foundation/webpack/webpack.js.org
-[2]: https://webpack.js.org/writers-guide/
+[2]: https://webpack.js.org/contribute/writers-guide/

.gitignore

@@ -9,4 +9,6 @@ npm-debug.log
 yarn-error.log
 package-lock.json
 .cache
-internal-links.tap
+internal-links.tap
+stats.json
+printable.md

README.md

@@ -1,9 +1,15 @@
-# webpack.js.org
+<div align="center">
+  <a href="https://github.com/webpack/webpack">
+    <img width="200" height="200" src="https://webpack.js.org/assets/icon-square-big.svg">
+  </a>
+  <h1>webpack.js.org</h1>
 
-[![Build Status][13]][10]
-[![Standard Version][12]][11]
-
-Guides, documentation, and all things webpack.
+  [![Build Status][build-status]][build-status-url]
+  [![Standard Version][release]][release-url]
+  [![chat on gitter][chat]][chat-url]  
+  
+  Guides, documentation, and all things webpack.
+</div>
 
 
 ## Content Progress
@@ -13,49 +19,48 @@ starting to heavily review each section of the site's content to sort and
 structure it appropriately. The following issues should provide a pretty good
 idea of where things are, and where they are going:
 
-- [Guides - Review and Simplify][1]
-- [Concepts - Review and Organize][2]
-- [API - v4 Rewrite][8]
+- [Guides - Review and Simplify][guides-url]
+- [Concepts - Review and Organize][concepts-url]
 
 We haven't created issues for the other sections yet, but they will be coming
-soon. For dev-related work please see [General - Updates & Fixes][3].
+soon. For dev-related work please see [General - Updates & Fixes][general-url].
 
+The alpha version of webpack 5 is out and we are lagging behind with documenting all of the related changes. See [this refined search][webpack5-milestone-url] for the list of relevant documentation requests.
 
 ## Translation
 
-To help translate this documentation please jump to the [translate branch][4].
-
+To help translate this documentation please jump to the [translation branch][translate-url].
 
 ## Contributing
 
-Read through the [writer's guide][7] if you're interested in editing the
-content on this site. See the [contributors page][5] to learn how to set up and
+Read through the [writer's guide][writer-guide-url] if you're interested in editing the
+content on this site. See the [contributors page][contributing-url] to learn how to set up and
 start working on the site locally.
 
-
 ## License
 
-The content is available under the [Creative Commons BY 4.0][6] license.
-
+The content is available under the [Creative Commons BY 4.0][license-url] license.
 
 ## Special Thanks
 
 _BrowserStack_ has graciously allowed us to do cross-browser and cross-os
 testing of the site at no cost...
 
-[![BrowserStackLogo](./browserstack-logo.png)][9]
-
-
-[1]: https://github.com/webpack/webpack.js.org/issues/1258
-[2]: https://github.com/webpack/webpack.js.org/issues/1386
-[3]: https://github.com/webpack/webpack.js.org/issues/1525
-[4]: https://github.com/webpack/webpack.js.org/tree/translation
-[5]: https://github.com/webpack/webpack.js.org/blob/master/.github/CONTRIBUTING.md
-[6]: https://creativecommons.org/licenses/by/4.0/
-[7]: https://webpack.js.org/writers-guide
-[8]: https://github.com/webpack/webpack.js.org/pull/1754
-[9]: http://browserstack.com/
-[10]: http://travis-ci.org/webpack/webpack.js.org
-[11]: https://github.com/conventional-changelog/standard-version
-[12]: https://img.shields.io/badge/release-standard%20version-brightgreen.svg
-[13]: https://secure.travis-ci.org/webpack/webpack.js.org.svg
+[![BrowserStackLogo][browserstack]][browserstack-url]
+
+[webpack5-milestone-url]: https://github.com/webpack/webpack.js.org/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22webpack+5%22
+[build-status]: https://secure.travis-ci.org/webpack/webpack.js.org.svg
+[build-status-url]: http://travis-ci.org/webpack/webpack.js.org
+[browserstack]: ./browserstack-logo.png
+[browserstack-url]: http://browserstack.com/
+[chat]: https://badges.gitter.im/webpack/webpack.svg
+[chat-url]: https://gitter.im/webpack/webpack
+[concepts-url]: https://github.com/webpack/webpack.js.org/issues/1386
+[contributing-url]: https://github.com/webpack/webpack.js.org/blob/master/.github/CONTRIBUTING.md
+[general-url]: https://github.com/webpack/webpack.js.org/issues/1525
+[guides-url]: https://github.com/webpack/webpack.js.org/issues/1258
+[license-url]: https://creativecommons.org/licenses/by/4.0/
+[release]: https://img.shields.io/badge/release-standard%20version-brightgreen.svg
+[release-url]: https://github.com/conventional-changelog/standard-version
+[translate-url]: https://github.com/webpack/webpack.js.org/tree/translation
+[writer-guide-url]: https://webpack.js.org/contribute/writers-guide

package.json

@@ -24,29 +24,34 @@
     "node": ">=8.9.4"
   },
   "scripts": {
-    "clean": "rimraf ./dist src/content/**/_*.md src/**/_*.json",
-    "start": "cross-env NODE_ENV=development webpack-dev-server --config webpack.dev.js --env.dev",
+    "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",
     "content": "node src/scripts/build-content-tree.js ./src/content ./src/_content.json",
-    "build-test": "npm run build && http-server dist/",
+    "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": "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 content && cross-env NODE_ENV=production webpack --config webpack.prod.js",
-    "postbuild": "npm run sitemap",
+    "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": "bundlesize && 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,.md --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:social": "alex . -q",
     "lint:prose": "cp .proselintrc ~/ && proselint src/content",
-    "lint:links": "hyperlink -r dist/index.html --canonicalroot https://webpack.js.org/ -i --todo https://img.shields.io --todo https://codecov.io/gh --todo 'content-type-mismatch https://travis-ci.org' --todo 'Asset is used as both Html and Image' | tee internal-links.tap | tap-spot",
-    "linkcheck": "hyperlink -r dist/index.html --canonicalroot https://webpack.js.org/ --skip support__ --skip sidecar.gitter.im --skip vimdoc.sourceforge.net --skip img.shields.io --skip npmjs.com/package/ --skip opencollective.com/webpack --todo external-redirect | tee external-links.tap | tap-spot",
-    "sitemap": "cd dist && sitemap-static --prefix=https://webpack.js.org/ > sitemap.xml",
+    "lint:links": "hyperlink -c 8 -r dist/index.html --canonicalroot https://webpack.js.org/ -i --skip https://img.shields.io --skip https://codecov.io/gh --skip 'content-type-mismatch https://travis-ci.org' > internal-links.tap; cat internal-links.tap | tap-spot",
+    "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",
-    "deploy": "gh-pages -d dist"
+    "deploy": "gh-pages -d dist",
+    "preprintable": "npm run clean-printable",
+    "printable": "node ./src/scripts/concatenate-docs.js"
   },
   "husky": {
     "hooks": {
@@ -61,10 +66,16 @@
       "npm run lint:markdown"
     ]
   },
+  "bundlesize": [
+    {
+      "path": "./dist/index.bundle.js",
+      "maxSize": "200 kB"
+    }
+  ],
   "devDependencies": {
     "@mdx-js/loader": "0.15.7",
     "@mdx-js/mdx": "0.15.7",
-    "@octokit/rest": "^15.9.4",
+    "@octokit/rest": "^16.27.1",
     "alex": "^5.1.0",
     "autoprefixer": "^7.2.3",
     "babel-core": "^6.26.0",
@@ -75,6 +86,7 @@
     "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",
@@ -92,66 +104,68 @@
     "html-webpack-template": "^6.1.0",
     "http-server": "^0.10.0",
     "husky": "^1.0.0-rc.8",
-    "hyperlink": "^4.0.0",
+    "hyperlink": "^4.4.0",
     "lint-staged": "^8.1.0",
     "loader-utils": "^1.1.0",
     "lodash": "^4.17.4",
     "markdown-loader": "^4.0.0",
     "markdownlint": "^0.11.0",
     "markdownlint-cli": "^0.13.0",
     "markdownlint-rule-emphasis-style": "^1.0.0",
-    "marked": "^0.5.2",
-    "mermaid.cli": "^0.3.6",
+    "marked": "0.6.1",
     "mini-css-extract-plugin": "^0.5.0",
     "minimist": "1.2.0",
     "mkdirp": "^0.5.1",
     "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.0.0",
+    "remark-autolink-headings": "5.2.1",
     "remark-custom-blockquotes": "1.0.0",
-    "remark-extract-anchors": "1.0.0",
+    "remark-extract-anchors": "1.0.2",
     "remark-loader": "^0.3.0",
-    "remark-mermaid": "^0.2.0",
     "remark-refractor": "1.1.0",
     "remark-responsive-tables": "1.0.0",
     "remark-slug": "^5.0.0",
-    "request": "^2.81.0",
-    "request-promise": "^4.2.2",
+    "request-promise": "4.2.4",
     "rimraf": "^2.6.2",
     "sass-loader": "^6.0.6",
     "sirv-cli": "^0.1.2",
     "sitemap-static": "^0.4.2",
     "static-site-generator-webpack-plugin": "^3.4.1",
     "style-loader": "^0.18.2",
     "tap-spot": "^1.1.1",
+    "terser-webpack-plugin": "^1.2.3",
     "through2": "^2.0.3",
     "uglifyjs-webpack-plugin": "^1.1.6",
-    "webpack": "^4.29.6",
+    "webpack": "^4.30.0",
+    "webpack-bundle-analyzer": "^3.3.2",
     "webpack-cli": "^3.2.3",
     "webpack-dev-server": "^3.2.1",
     "webpack-merge": "^4.1.0"
   },
   "dependencies": {
-    "@rigor789/remark-autolink-headings": "^5.1.0",
     "ajv": "^5.5.2",
     "docsearch.js": "^2.5.2",
     "gitter-sidecar": "^1.2.3",
     "javascriptstuff-db": "^1.12.0",
     "lodash.throttle": "^4.1.1",
-    "prop-types": "^15.5.10",
-    "react": "^16.2.0",
+    "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.2.0",
+    "react-dom": "^16.8.6",
     "react-g-analytics": "0.4.2",
     "react-hot-loader": "^4.0.0-beta.12",
-    "react-markdown": "4.0.4",
+    "react-markdown": "4.2.2",
     "react-router-dom": "^4.2.2",
     "react-tiny-popover": "3.4.2",
+    "react-visibility-sensor": "^5.0.2",
+    "webpack-pwa-manifest": "^4.0.0",
     "webpack.vote": "^0.1.2",
     "whatwg-fetch": "^2.0.3"
   }

repositories/loaders.json

@@ -37,7 +37,6 @@
   "webpack-contrib/cache-loader",
   "webpack-contrib/thread-loader",
   "webpack-contrib/polymer-webpack-loader",
-  "webpack-contrib/config-loader",
   "babel/babel-loader",
   "postcss/postcss-loader",
   "peerigon/extract-loader"

repositories/plugins.json

@@ -1,6 +1,5 @@
 [
   "webpack-contrib/i18n-webpack-plugin",
-  "webpack-contrib/component-webpack-plugin",
   "webpack-contrib/compression-webpack-plugin",
   "webpack-contrib/extract-text-webpack-plugin",
   "webpack-contrib/copy-webpack-plugin",

sitemap-ignore.json

@@ -0,0 +1,4 @@
+[
+	"app-shell/index.html",
+	"appcache/manifest.html"
+]

src/assets/icon-print.svg

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /**/printable/