Merge branch 'master' into concepts-tweaking

Author: rouzbeh84

.proselintrc

@@ -1,9 +1,8 @@
 {
     "max_errors": 1000,
     "checks": {
-				"phrasal_adjectives.ly"  				: false,
-				"preferred_form"								: false,
-				"symbols.curly_quotes"					: false,
+        "phrasal_adjectives.ly"         : false,
+        "preferred_forms"               : false,
         "airlinese.misc"                : true,
         "annotations.misc"              : false,
         "archaism.misc"                 : true,
@@ -18,7 +17,7 @@
         "dates_times.am_pm"             : true,
         "dates_times.dates"             : true,
         "hedging.misc"                  : true,
-        "hyperbole.misc"                : true,
+        "hyperbole.misc"                : false,
         "jargon.misc"                   : true,
         "lexical_illusions.misc"        : true,
         "links.broken"                  : false,
@@ -42,8 +41,8 @@
         "misc.metadiscourse"            : true,
         "misc.narcissism"               : true,
         "misc.not_guilty"               : true,
-        "misc.phrasal_adjectives"       : true,
-        "misc.preferred_forms"          : true,
+        "misc.phrasal_adjectives"       : false,
+        "misc.preferred_forms"          : false,
         "misc.pretension"               : true,
         "misc.professions"              : true,
         "misc.punctuation"              : true,
@@ -76,8 +75,8 @@
         "terms.eponymous_adjectives"    : true,
         "terms.venery"                  : true,
         "typography.diacritical_marks"  : true,
-        "typography.exclamation"        : true,
-        "typography.symbols"            : true,
+        "typography.exclamation"        : false,
+        "typography.symbols"            : false,
         "uncomparables.misc"            : true,
         "weasel_words.misc"             : true,
         "weasel_words.very"             : true

CONTRIBUTING.md

@@ -4,11 +4,10 @@ From adding an issue for a documentation suggestion to creating a pull request:
 
 ## Setup
 
-* Install [Node.js](https://nodejs.org/) if you have not already.  
-  *Note: Node 6 or greater may be required for "best results".*
+* Install [Node.js](https://nodejs.org/) if you have not already.
+  *Note: Node 6.9.* is required for "best results".*. Node 7 may have issues!
 * Fork the **webpack.js.org** repo at [https://github.com/webpack/webpack.js.org](https://github.com/webpack/webpack.js.org).
 * `git clone <your-clone-url> && cd webpack.js.org`
-* `git checkout develop`
 * `npm install`
 * `npm run build`
 * `npm start`
@@ -22,55 +21,26 @@ Run `git config user.email` to see your Git email, and verify it with [your GitH
 
 ## Editor Config
 
-The [.editorconfig](https://github.com/webpack/webpack.js.org/blob/develop/.editorconfig) in the root should ensure consistent formatting. Please make sure you've [installed the plugin](http://editorconfig.org/#download) if your text editor needs one.
-
-## Git Flow
-
-We are using the [git flow](http://nvie.com/posts/a-successful-git-branching-model/) branching model. Please direct all pull requests to the [develop](https://github.com/webpack/webpack.js.org/tree/develop) branch.
+The [.editorconfig](https://github.com/webpack/webpack.js.org/blob/master/.editorconfig) in the root should ensure consistent formatting. Please make sure you've [installed the plugin](http://editorconfig.org/#download) if your text editor needs one.
 
 ## Branching Your Changes
 
-Making a branch in your fork for your contribution is helpful in the following ways:  
+Making a branch in your fork for your contribution is helpful in the following ways:
 
 * It allows you to have multiple contributions in as PRs at once.
 * It allows us to identify what your contribution is about from the branch name.
 
-You will want to checkout the `develop` branch locally before creating your new branch.
-
-There are two types of branches:
-
-* Feature
-* Hotfix
-
-### Features
-
-If your contribution is something new, like a new section or page or a new chunk to an existing page, you can create a branch with the following naming convention:  
-
-`feature/<the-new-feature>`
-
-So, for example, if you are adding a page on how to write a custom loader your branch could have the name:
-
-`feature/add-custom-loaders-page`
-
-### Fixes
-
-If you are fixing existing content or code you can create a branch with the following naming convention:
-
-`hotfix/<the-fix>`
-
-So, for example, if you are fixing spelling on the api configuration page for an option, your branch could have the name:
-
-`hotfix/fix-option-property-spelling-on-api-configuration`
-
 ## Submitting Changes
 
 After getting some feedback, push to your fork branch and submit a pull request. We may suggest some changes or improvements or alternatives, but for small changes your pull request should be accepted quickly.
 
-Issue the PR to the [develop](https://github.com/webpack/webpack.js.org/tree/develop) branch.
+Issue the PR to the [master](https://github.com/webpack/webpack.js.org/tree/master) branch.
+
+> See [GitHub documentation](https://help.github.com/articles/proposing-changes-to-your-work-with-pull-requests/) for more help.
 
 ## Contribution Recognition
 
-Any document that you edit, you can choose to add your Github username at the top of the document for recognition: 
+Any document that you edit, you can choose to add your GitHub username at the top of the document for recognition:
 
 **example.md**
 
@@ -80,7 +50,7 @@ title: Some Example Page
 contributors:
   - TheLarkInn
   - Sokra
-  - Bebraw
+  - bebraw
   - Jhnns
   - SpaceK33z
 ===
@@ -89,7 +59,7 @@ contributors:
 
 ```
 
-This will add your name and Github profile photo to the document in production. This is a great way to own the awesome work that you do and encourage that you remember to do this in your PR's. 
+This will add your name and GitHub profile photo to the document in production. This is a great way to own the awesome work that you do and encourage that you remember to do this in your PR's.
 
 
 ## Thank you

README.md

@@ -12,10 +12,14 @@ To develop, please pull the project, `cd` into the directory and run:
 - `npm run build` to create a production version of the site.
 - `npm start` to develop on a local webpack-dev-server (should be [here](http://localhost:3000/)).
 
-If you want to fetch data for `/loaders` and `/plugins` pages, run `npm run fetch`.
+If you want to fetch the documentation on additional loaders/plugins hosted in [separate repositories](https://github.com/webpack), run `npm run fetch`.
 
-For more information see the [contributors page](https://github.com/webpack/webpack.js.org/blob/develop/CONTRIBUTING.md)
+For more information see the [contributors page](https://github.com/webpack/webpack.js.org/blob/master/CONTRIBUTING.md)
 
 ## Content Progress
 
 Check out the [MVP Milestone](https://github.com/webpack/webpack.js.org/milestones) for the current status.
+
+## License
+
+The content is available under [Creative Commons BY 4.0](https://creativecommons.org/licenses/by/4.0/) license.

antwar.config.js

@@ -107,22 +107,34 @@ module.exports = {
     loaders: section(
       'Loaders',
       function() {
-        return require.context(
+        const content = require.context(
+          'json-loader!yaml-frontmatter-loader!./content/loaders',
+          false,
+          /^\.\/.*\.md$/
+        );
+        const generated = require.context(
           'json-loader!yaml-frontmatter-loader!./generated/loaders',
           false,
           /^\.\/.*\.md$/
         );
+        return combineContexts(content, generated);
       }
     ),
 
     plugins: section(
       'Plugins',
       function() {
-        return require.context(
+        const content = require.context(
+          'json-loader!yaml-frontmatter-loader!./content/plugins',
+          false,
+          /^\.\/.*\.md$/
+        );
+        const generated = require.context(
           'json-loader!yaml-frontmatter-loader!./generated/plugins',
           false,
           /^\.\/.*\.md$/
         );
+        return combineContexts(content, generated);
       }
     ),
 
@@ -209,3 +221,19 @@ function processPage() {
     }
   };
 }
+
+function combineContexts(context1, context2) {
+  function webpackContext(req) {
+    try {
+      return context1(req);
+    } catch (e) {
+      return context2(req);
+    }
+  }
+  webpackContext.keys = () => {
+    let keys1 = context1.keys();
+    let keys2 = context2.keys();
+    return _.chain(keys1).concat(keys2).uniq().value();
+  };
+  return webpackContext;
+}

bootstrap.js

@@ -1,6 +1,6 @@
 const antwar = require('antwar');
 
-const environment = process.env.npm_lifecycle_event;
+const environment = process.env.npm_lifecycle_event || 'build';
 
 // Patch Babel env to make HMR switch work
 process.env.BABEL_ENV = environment;

components/cc/cc-style.scss

@@ -0,0 +1,11 @@
+.footer__license {
+  display:inline-block;
+  height:35px;
+  margin-left: 1em;
+  margin-right: 1em;
+
+  img {
+    width:auto;
+    height:100%;
+  }
+}

components/cc/cc.jsx

@@ -0,0 +1,16 @@
+import React from 'react';
+import Link from '../link/link';
+import './cc-style.scss';
+
+const CC = () => {
+  return (
+    <Link to="https://creativecommons.org/licenses/by/4.0/" className="footer__license">
+      <img
+        alt="Creative Commons License"
+        src="https://i.creativecommons.org/l/by/4.0/88x31.png"
+      />
+    </Link>
+  );
+};
+
+export default CC;

components/footer/footer-style.scss

@@ -55,12 +55,12 @@
 }
 
 .footer__icon {
-  display:block;
+  display:inline-block;
   height:35px;
 
-  img { 
+  img {
     width:auto;
-    height:100%; 
+    height:100%;
   }
 }
 

components/footer/footer.jsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import CC from '../cc/cc';
 import Link from '../link/link';
 import Container from '../container/container';
 import Icon from '../../assets/icon-square-small.svg';
@@ -26,6 +27,7 @@ export default (props) => {
           <Link className="footer__link" to="//gitter.im/webpack/webpack">Support</Link>
           <Link className="footer__link" to="https://github.com/webpack/webpack/releases">Changelog</Link>
           <Link className="footer__link" to="/license">License</Link>
+          <CC />
         </section>
       </Container>
     </div>

components/page/page.jsx

@@ -6,9 +6,10 @@ import Sidecar from '../sidecar/sidecar';
 import Contributors from '../contributors/contributors';
 import './page-style';
 import '../sidebar/sidebar-style';
+import { trimEnd } from 'lodash';
 
 export default ({ section, page }) => {
-  let edit = `https://github.com/webpack/webpack.js.org/edit/develop/content/${page.url}.md`;
+  let edit = page.edit || `https://github.com/webpack/webpack.js.org/edit/master/content/${trimEnd(page.url, '/')}${page.type === 'index' ? '/index' : ''}.md`;
 
   return (
     <Container className="page">