Merge pull request #436 from webpack/develop

Deploy

Author: SpaceK33z

README.md

@@ -18,4 +18,4 @@ For more information see the [contributors page](https://github.com/webpack/webp
 
 ## Content Progress
 
-Check out the [MVP Milestone](https://github.com/webpack/webpack.js.org/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Webpack+2+-+Documentation+MVP%22) for the current status.
+Check out the [MVP Milestone](https://github.com/webpack/webpack.js.org/milestones) for the current status.

components/contributors/contributors-style.scss

@@ -1,9 +1,37 @@
+@import 'functions';
+
+.contributors__list {
+  padding: 6px;
+}
+
 .contributor {
-  display: inline-block;
-  margin-top:1em;
+  display: inline-flex;
+  flex-direction: column;
+  align-items: center;
   margin-right: 1em;
+  font-size: 14px;
 
   img {
-    height: 50px;
+    height: 45px;
+    width: 45px;
+    border-radius: 50%;
+    box-shadow: 0 0 2px rgba(0,0,0,0.3);
+  }
+
+  .contributor__name {
+    color: getColor(fiord);
+    margin-top: -6px;
+    box-shadow: 0 0 2px rgba(0,0,0,0.3);
+    line-height: 1.4;
+    transition: color 0.1s;
+    padding: 0 6px;
+    border-radius: 2px;
+    background: transparentize(getColor(white), 0.05);
+  }
+
+  &:hover {
+    .contributor__name {
+      color: lighten(getColor(denim), 5%);
+    }
   }
 }

components/contributors/contributors.jsx

@@ -9,14 +9,15 @@ export default ({contributors}) => {
   return (
     <div className="contributors">
       <hr />
-      <h3>Contributors:</h3>
+      <h3>Contributors</h3>
       <div className="contributors__list">
         {
           (contributors).map((contributor) => (
             <a key={ contributor }
               className="contributor"
               href={ `https://github.com/${contributor}` }>
-              <img src={ `https://github.com/${contributor}.png?size=50` } />
+              <img src={ `https://github.com/${contributor}.png?size=90` } />
+              <span className="contributor__name"> {contributor}</span>
             </a>
           ))
         }

components/splash/splash.jsx

@@ -28,10 +28,10 @@ export default props => {
         <p>Through contributions, donations, and sponsorship, you allow webpack to thrive. Your donations directly support office hours, continued enhancements, and most importantly, great documentation and learning material!</p>
 
         <h2>Sponsors</h2>
-        <Support number={ 5 } type="sponsor" />
+        <Support number={ 20 } type="sponsor" />
 
         <h2>Backers</h2>
-        <Support number={ 20 } type="backer" />
+        <Support number={ 100 } type="backer" />
       </Container>
     </div>
   );

components/support/support.jsx

@@ -14,12 +14,6 @@ export default ({number, type}) => {
             alt={ `${type} avatar` } />
         </a>
       )}
-
-      <div className="support__bottom">
-        <a className="support__button" href="https://opencollective.com/webpack#support">
-          Become a { type.replace(/\b./g, m => m.toUpperCase()) }
-        </a>
-      </div>
     </div>
   );
 };

components/vote/influence.jsx

@@ -5,17 +5,17 @@ export default class InfluenceComponent extends React.Component {
     constructor(props) {
         super(props);
     }
-    
+
     render() {
-        return (this.props.type === "normal" ? ( 
+        return (this.props.type === "normal" ? (
             <section className="influence-info influence-info__section">
                 <h1 className="influence-info__header">What is Influence?</h1>
-                <p><em>Influence</em> is a unit of measure based on time you have been a member on github. However, in 2017 and on you will recieve one influence per day.</p>            
+                <p><em>Influence</em> is a unit of measure based on time you have been a member on GitHub. However, in 2017 and on you will recieve one influence per day.</p>
             </section>
         ) : (
             <section className="influence-info influence-info__section">
                 <h1 className="influence-info__header">What is Golden Influence?</h1>
-                <p><em>Golden Influence</em> is equal to 100 <i>normal influence</i>. Golden Influence is obtained by being a backer or sponsor on our <a href="https://opencollective.com/webpack">Open Collective page</a>.</p>            
+                <p><em>Golden Influence</em> is equal to 100 <i>normal influence</i>. Golden Influence is obtained by being a backer or sponsor on our <a href="https://opencollective.com/webpack">Open Collective page</a>.</p>
             </section>
         ));
     }

content/configuration/index.md

@@ -7,7 +7,7 @@ contributors:
   - grgur
 ---
 
-Webpack is fed a configuration object. It is passed in one of two ways depending on how you are using webpack: through the terminal or via Node.js. All the available configuration options are specified below.
+Webpack is fed via a configuration object. It is passed in one of two ways depending on how you are using webpack: through the terminal or via Node.js. All the available configuration options are specified below.
 
 T> Notice that throughout the configuration we use Node's built-in [path module](https://nodejs.org/api/path.html). This prevents file path issues between operating systems. See [this section](https://nodejs.org/api/path.html#path_windows_vs_posix) for more.
 

content/configuration/target.md

@@ -6,28 +6,25 @@ contributors:
   - sokra
   - skipjack
   - SpaceK33z
+  - pastelsky
 ---
 
-webpack can compile to multiple environments. We call this _targets_. This page shows what targets are supported. [The concept page](/concepts/targets) explains in greater detail what a target is.
+webpack can compile for multiple environments or _targets_. To understand what a target is in detail, read [the concepts](/concepts/targets).
 
 ## `target`
 
 `string`
 
-Tell webpack what environment the application is targeting. The following values are supported:
+Tells webpack which environment the application is targeting. The following values are supported:
 
-* `"async-node"` Compile for usage in a Node.js-like environment (use `fs` and `vm` to load chunks async)
-* `"electron"` Compile for [Electron](http://electron.atom.io/) renderer process, provide a target using `JsonpTemplatePlugin`, `FunctionModulePlugin` for browser environment and `NodeTargetPlugin` and `ExternalsPlugin` for CommonJs and Electron built-in modules.
-* `"electron-renderer"` - Compile for [Electron](http://electron.atom.io/) for `renderer-process`
-* `"node"` Compile for usage in a Node.js-like environment (uses Node.js `require` to load chunks)
-* `"node-webkit"` Compile for usage in WebKit and uses jsonp chunk loading. Allows importing of built-in Node.js modules and [`nw.gui`](http://docs.nwjs.io/en/latest/) (experimental)
-* `"web"` Compile for usage in a browser-like environment (default)
-* `"webworker"` Compile as WebWorker
+| `target`      | Description            |
+| ------------- |------------------------|
+| `async-node`| Compile for usage in a Node.js-like environment (uses `fs` and `vm` to load chunks asynchronously)    |
+| `electron`      | Compile for [Electron](http://electron.atom.io/) renderer process, provide a target using `JsonpTemplatePlugin`, `FunctionModulePlugin` for browser environments and `NodeTargetPlugin` and `ExternalsPlugin` for CommonJs and Electron built-in modules. |
+| `electron-renderer` | Compile for [Electron](http://electron.atom.io/) for `renderer-process` |
+| `"node"` | Compile for usage in a Node.js-like environment (uses Node.js `require` to load chunks) |
+|`node-webkit`|  Compile for usage in WebKit and uses JSONP for chunk loading. Allows importing of built-in Node.js modules and [`nw.gui`](http://docs.nwjs.io/en/latest/) (experimental) |
+|`web`| Compile for usage in a browser-like environment **(default)** |
+|`webworker`| Compile as WebWorker |
 
-For example, when you use the `"electron"` _target_, *webpack* includes multiple Electron specific variables. For more information on which templates and _externals_ are used, you can refer [directly to the webpack source code](https://github.com/webpack/webpack/blob/master/lib/WebpackOptionsApply.js#L70-L185).
-
-The target option defaults to:
-
-```js
-target: "web"
-```
+For example, when the `target` is set to `"electron"`, webpack includes multiple electron specific variables. For more information on which templates and externals are used, you can refer to webpack's [source code](https://github.com/webpack/webpack/blob/master/lib/WebpackOptionsApply.js#L70-L185).

content/get-started/index.md

@@ -85,10 +85,9 @@ Also we will need to change the `index.html` to expect a single bundled js file.
     <title>Webpack demo</title>
 -   <script src="https://unpkg.com/[email protected]" type="text/javascript"></script>
 -   <script src="app/index.js" type="text/javascript"></script>
-+   <script src="dist/bundle.js" type="text/javascript"></script>
   </head>
   <body>
-    <div id="root"></div>
++   <script src="dist/bundle.js" type="text/javascript"></script>
   </body>
 </html>
 ```

content/guides/code-splitting-libraries.md

@@ -33,7 +33,7 @@ __webpack.config.js__
 
 ```javascript
 
-modules.export = function(env) {
+module.exports = function(env) {
     return {
         entry: './index.js',
         output: {
@@ -56,7 +56,7 @@ __webpack.config.js__
 
 ```javascript
 
-modules.export = function(env) {
+module.exports = function(env) {
     return {
         entry: {
             main: './index.js',
@@ -85,7 +85,7 @@ __webpack.config.js__
 ```javascript
 
 var webpack = require('webpack');
-modules.export = function(env) {
+module.exports = function(env) {
     return {
         entry: {
             main: './index.js',
@@ -119,7 +119,7 @@ __webpack.config.js__
 ```javascript
 
 var webpack = require('webpack');
-modules.export = function(env) {
+module.exports = function(env) {
     return {
         entry: {
             main: './index.js',
@@ -138,4 +138,4 @@ modules.export = function(env) {
 };
 ```
 
-With the above webpack config, we see three bundles being generated. `vendor`, `main` and `manifest` bundles.
+With the above webpack config, we see three bundles being generated. `vendor`, `main` and `manifest` bundles.