Merge branch 'master' into types-plugins

Author: EugeneHlushko

package.json

@@ -113,7 +113,6 @@
     "markdownlint-cli": "^0.13.0",
     "markdownlint-rule-emphasis-style": "^1.0.0",
     "marked": "0.6.1",
-    "mermaid.cli": "^0.3.6",
     "mini-css-extract-plugin": "^0.5.0",
     "minimist": "1.2.0",
     "mkdirp": "^0.5.1",
@@ -125,16 +124,14 @@
     "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.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",
@@ -152,7 +149,6 @@
     "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",
@@ -165,7 +161,7 @@
     "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",

src/content/api/compilation-object.md

@@ -322,3 +322,37 @@ Parameters:
 ### checkConstraints
 
 `function`
+
+### emitAsset
+
+`function (file, source, assetInfo = {})`
+
+Parameters:
+
+- `file` - file name of the asset
+- `source` - source of the asset
+- `assetInfo` - additional asset information
+
+### updateAsset
+
+`function (file, newSourceOrFunction, assetInfoUpdateOrFunction)`
+
+Parameters:
+
+- `file` - file name of the asset
+- `newSourceOrFunction` - new asset source or function converting old to new
+- `assetInfoUpdateOrFunction` - new asset info or function converting old to new
+
+### getAssets
+
+`function`
+
+Returns array of all assets under current compilation.
+
+### getAsset
+
+`function (name)`
+
+Parameters:
+
+`name` - the name of the asset to return

src/content/concepts/index.md

@@ -47,7 +47,7 @@ For a better understanding of the ideas behind module bundlers and how they work
 
 An __entry point__ indicates which module webpack should use to begin building out its internal [dependency graph](/concepts/dependency-graph/). webpack will figure out which other modules and libraries that entry point depends on (directly and indirectly).
 
-By default its value is `./src/index.js`, but you can specify a different (or multiple entry points) by configuring the __entry__ property in the [webpack configuration](/configuration). For example:
+By default its value is `./src/index.js`, but you can specify a different (or multiple entry points) by setting an [`entry` property in the webpack configuration](/configuration/entry-context/#entry). For example:
 
 __webpack.config.js__
 
@@ -119,7 +119,7 @@ The configuration above has defined a `rules` property for a single module with
 
 W> It is important to remember that when defining rules in your webpack config, you are defining them under `module.rules` and not `rules`. For your benefit, webpack will warn you if this is done incorrectly.
 
-W> Keep in mind that when using regex to match files, you may not quote it. i.e `/\.txt$/` is not the same as `'/\.txt$/'` or `"/\.txt$/"`. The former instructs webpack to match any file that ends with .txt and the latter instructs webpack to match a single file with an absolute path '.txt'; this is likely not your intention. 
+W> Keep in mind that when using regex to match files, you may not quote it. i.e `/\.txt$/` is not the same as `'/\.txt$/'` or `"/\.txt$/"`. The former instructs webpack to match any file that ends with .txt and the latter instructs webpack to match a single file with an absolute path '.txt'; this is likely not your intention.
 
 You can check further customization when including loaders in the [loaders section](/concepts/loaders).
 

src/content/concepts/module-resolution.md

@@ -61,7 +61,7 @@ You can replace the original module path by an alternate path by creating an ali
 Once the path is resolved based on the above rule, the resolver checks to see if the path points to a file or a directory. If the path points to a file:
 
 - If the path has a file extension, then the file is bundled straightaway.
-- Otherwise, the file extension is resolved using the [`resolve.extensions`](/configuration/resolve/#resolveextensions) option, which tells the resolver which extensions (eg - `.js`, `.jsx`) are acceptable for resolution.
+- Otherwise, the file extension is resolved using the [`resolve.extensions`](/configuration/resolve/#resolveextensions) option, which tells the resolver which extensions are acceptable for resolution e.g. `.js`, `.jsx`.
 
 If the path points to a folder, then the following steps are taken to find the right file with the right extension:
 

src/content/concepts/modules.md

@@ -45,6 +45,7 @@ The webpack community has built _loaders_ for a wide variety of popular language
 - [Sass](http://sass-lang.com)
 - [Less](http://lesscss.org)
 - [Stylus](http://stylus-lang.com)
+- [Elm](https://elm-lang.org/)
 
 And many others! Overall, webpack provides a powerful and rich API for customization that allows one to use webpack for __any stack__, while staying __non-opinionated__ about your development, testing, and production workflows.
 

src/content/contribute/writing-a-plugin.md

@@ -13,9 +13,9 @@ Plugins expose the full potential of the webpack engine to third-party developer
 
 ## Creating a Plugin
 
-A plugin for webpack consists of
+A plugin for webpack consists of:
 
-- A named JavaScript function.
+- A named JavaScript function or a JavaScript class.
 - Defines `apply` method in its prototype.
 - Specifies an [event hook](/api/compiler-hooks/) to tap into.
 - Manipulates webpack internal instance specific data.

src/content/guides/asset-management.md

@@ -48,8 +48,8 @@ __webpack.config.js__
     output: {
 -     filename: 'main.js',
 +     filename: 'bundle.js',
-      path: path.resolve(__dirname, 'dist')
-    }
+      path: path.resolve(__dirname, 'dist'),
+    },
   };
 ```
 
@@ -71,19 +71,19 @@ __webpack.config.js__
     entry: './src/index.js',
     output: {
       filename: 'bundle.js',
-      path: path.resolve(__dirname, 'dist')
+      path: path.resolve(__dirname, 'dist'),
     },
 +   module: {
 +     rules: [
 +       {
 +         test: /\.css$/,
 +         use: [
 +           'style-loader',
-+           'css-loader'
-+         ]
-+       }
-+     ]
-+   }
++           'css-loader',
++         ],
++       },
++     ],
++   },
   };
 ```
 
@@ -169,7 +169,7 @@ __webpack.config.js__
     entry: './src/index.js',
     output: {
       filename: 'bundle.js',
-      path: path.resolve(__dirname, 'dist')
+      path: path.resolve(__dirname, 'dist'),
     },
     module: {
       rules: [
@@ -178,16 +178,16 @@ __webpack.config.js__
           use: [
             'style-loader',
             'css-loader'
-          ]
+          ],
         },
 +       {
 +         test: /\.(png|svg|jpg|gif)$/,
 +         use: [
-+           'file-loader'
-+         ]
-+       }
-      ]
-    }
++           'file-loader',
++         ],
++       },
+      ],
+    },
   };
 ```
 
@@ -277,7 +277,7 @@ __webpack.config.js__
     entry: './src/index.js',
     output: {
       filename: 'bundle.js',
-      path: path.resolve(__dirname, 'dist')
+      path: path.resolve(__dirname, 'dist'),
     },
     module: {
       rules: [
@@ -286,22 +286,22 @@ __webpack.config.js__
           use: [
             'style-loader',
             'css-loader'
-          ]
+          ],
         },
         {
           test: /\.(png|svg|jpg|gif)$/,
           use: [
-            'file-loader'
-          ]
+            'file-loader',
+          ],
         },
 +       {
 +         test: /\.(woff|woff2|eot|ttf|otf)$/,
 +         use: [
-+           'file-loader'
-+         ]
-+       }
-      ]
-    }
++           'file-loader',
++         ],
++       },
+      ],
+    },
   };
 ```
 
@@ -381,7 +381,7 @@ __webpack.config.js__
     entry: './src/index.js',
     output: {
       filename: 'bundle.js',
-      path: path.resolve(__dirname, 'dist')
+      path: path.resolve(__dirname, 'dist'),
     },
     module: {
       rules: [
@@ -390,34 +390,34 @@ __webpack.config.js__
           use: [
             'style-loader',
             'css-loader'
-          ]
+          ],
         },
         {
           test: /\.(png|svg|jpg|gif)$/,
           use: [
-            'file-loader'
-          ]
+            'file-loader',
+          ],
         },
         {
           test: /\.(woff|woff2|eot|ttf|otf)$/,
           use: [
-            'file-loader'
-          ]
+            'file-loader',
+          ],
         },
 +       {
 +         test: /\.(csv|tsv)$/,
 +         use: [
-+           'csv-loader'
-+         ]
++           'csv-loader',
++         ],
 +       },
 +       {
 +         test: /\.xml$/,
 +         use: [
-+           'xml-loader'
-+         ]
-+       }
-      ]
-    }
++           'xml-loader',
++         ],
++       },
+      ],
+    },
   };
 ```
 
@@ -541,43 +541,43 @@ __webpack.config.js__
     entry: './src/index.js',
     output: {
       filename: 'bundle.js',
-      path: path.resolve(__dirname, 'dist')
+      path: path.resolve(__dirname, 'dist'),
     },
 -   module: {
 -     rules: [
 -       {
 -         test: /\.css$/,
 -         use: [
 -           'style-loader',
--           'css-loader'
--         ]
+-           'css-loader',
+-         ],
 -       },
 -       {
 -         test: /\.(png|svg|jpg|gif)$/,
 -         use: [
--           'file-loader'
--         ]
+-           'file-loader',
+-         ],
 -       },
 -       {
 -         test: /\.(woff|woff2|eot|ttf|otf)$/,
 -         use: [
--           'file-loader'
--         ]
+-           'file-loader',
+-         ],
 -       },
 -       {
 -         test: /\.(csv|tsv)$/,
 -         use: [
--           'csv-loader'
--         ]
+-           'csv-loader',
+-         ],
 -       },
 -       {
 -         test: /\.xml$/,
 -         use: [
--           'xml-loader'
--         ]
--       }
--     ]
--   }
+-           'xml-loader',
+-         ],
+-       },
+-     ],
+-   },
   };
 ```