Resolve conflicts

Author: dhruvdutt

src/components/SidebarItem/SidebarItem.scss

@@ -38,6 +38,7 @@
     padding-left: 1.5em;
     overflow: hidden;
     list-style: none;
+    line-height: 19px;
 
     &:before {
       content: '';

src/content/api/stats.md

@@ -3,6 +3,7 @@ title: Stats Data
 sort: 3
 contributors:
   - skipjack
+  - franjohn21
 ---
 
 When compiling source code with webpack, users can generate a JSON file containing statistics about modules. These statistics can be used to analyze an application's dependency graph as well as to optimize compilation speed. The file is typically generated with the following CLI command:
@@ -24,6 +25,7 @@ The top-level structure of the output JSON file is fairly straightforward but th
   "hash": "11593e3b3ac85436984a", // Compilation specific hash
   "time": 2469, // Compilation time in milliseconds
   "filteredModules": 0, // A count of excluded modules when [`exclude`](/configuration/stats/#stats) is passed to the [`toJson`](/api/node/#stats-tojson-options-) method
+  "outputPath": "/", // path to webpack output directory
   "assetsByChunkName": {
     // Chunk name to emitted asset(s) mapping
     "main": "web.js?h=11593e3b3ac85436984a",

src/content/guides/asset-management.md

@@ -6,6 +6,7 @@ contributors:
   - michael-ciniawsky
   - TheDutchCoder
   - sudarsangp
+  - chenxsan
 ---
 
 If you've been following the guides from the start, you will now have a small project that shows "Hello webpack". Now let's try to incorporate some other assets, like images, to see how they can be handled.
@@ -325,7 +326,7 @@ __project__
   |- /node_modules
 ```
 
-With the loader configured and fonts in place, you can use incorporate them via an `@font-face` declaration. The local `url(...)` directive will be picked up by webpack just as it was with the image:
+With the loader configured and fonts in place, you can incorporate them via an `@font-face` declaration. The local `url(...)` directive will be picked up by webpack just as it was with the image:
 
 __src/style.css__
 

src/content/guides/production.md

@@ -177,7 +177,7 @@ __webpack.prod.js__
 +       sourceMap: true
 +     })
     ]
-  })
+  });
 ```
 
 T> Avoid `inline-***` and `eval-***` use in production as they can increase bundle size and reduce the overall performance.
@@ -200,12 +200,13 @@ __webpack.prod.js__
     plugins: [
       new UglifyJSPlugin({
         sourceMap: true
-      }),
+-     })
++     }),
 +     new webpack.DefinePlugin({
 +       'process.env.NODE_ENV': JSON.stringify('production')
 +     })
     ]
-  })
+  });
 ```
 
 T> Technically, `NODE_ENV` is a system environment variable that Node.js exposes into running scripts. It is used by convention to determine dev-vs-prod behavior by server tools, build scripts, and client-side libraries. Contrary to expectations, `process.env.NODE_ENV` is not set to `"production"` __within__ the build script `webpack.config.js`, see [#2537](https://github.com/webpack/webpack/issues/2537). Thus, conditionals like `process.env.NODE_ENV === 'production' ? '[name].[hash].bundle.js' : '[name].bundle.js'` within webpack configurations do not work as expected.

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

@@ -3,6 +3,7 @@ title: Progressive Web Application
 sort: 14
 contributors:
   - johnnyreilly
+  - chenxsan
 ---
 
 T> This guide extends on code examples found in the [Output Management](/guides/output-management) guide.
@@ -78,7 +79,7 @@ __webpack.config.js__
 +     title: 'Progressive Web Application'
 -   })
 +   }),
-+   new WorkboxPlugin({
++   new WorkboxPlugin.GenerateSW({
 +     // these options encourage the ServiceWorkers to get in there fast 
 +     // and not allow any straggling "old" SWs to hang around
 +     clientsClaim: true,

src/content/guides/tree-shaking.md

@@ -40,7 +40,7 @@ webpack-demo
   |- index.html
 |- /src
   |- index.js
-  |- math.js
++ |- math.js
 |- /node_modules
 ```