Merge remote-tracking branch 'upstream/master'

Author: hello-lizhihua

.eslintignore

@@ -1,2 +1,3 @@
 build/
+generated/
 antwar.config.js

.eslintrc

@@ -25,5 +25,19 @@
     "no-unused-vars": 0,
     "no-console": 0,
     "semi": ["error", "always"]
-  }
+  },
+
+  "overrides": [
+    {
+      "files": ["src/content/**/*.md"],
+      "rules": {
+        "indent": ["error", 2],
+        "quotes": ["error", "single"],
+        "no-undef": 0,
+        "no-constant-condition": 0,
+        "no-useless-escape": 0,
+        "no-dupe-keys": 0
+      }
+    }
+  ]
 }

.github/CONTRIBUTING.md

@@ -16,7 +16,7 @@ Start by ensuring you have Node installed and forking the repository:
 
 Once you are in the project directory, run the following commands:
 
-- `npm install` to pull all dependencies.
+- `npm install` to pull all dependencies. Make sure to check notes below if you prefer Yarn.
 - `npm run build` to create a production version of the site.
 - `npm start` to develop on a local webpack-dev-server: [localhost:3000][3].
 - `npm run fetch` to retrieve external documentation/data.
@@ -30,6 +30,8 @@ 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.
+
 > 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.
 
 
@@ -59,7 +61,7 @@ Making a branch in your fork for your contribution is helpful in the following w
 
 ## Committing Your Changes
 
-Please follow the [conventionalcommits][10] specification. For example, for documentation
+Please follow the [conventional commits][10] specification. For example, for documentation
 changes, a short commit message may resemble the following:
 
 ``` md
@@ -125,3 +127,4 @@ any time spent fixing typos or clarifying sections in the documentation.
 [10]: http://conventionalcommits.org/
 [11]: https://github.com/conventional-changelog/standard-version
 [12]: https://github.com/amperser/proselint
+[13]: https://yarnpkg.com/lang/en/docs/install

.github/ISSUE_TEMPLATE/Documentation_request.md

@@ -0,0 +1,16 @@
+---
+name: Documentation request
+about: Create a documentation request for a new feature or functionality change.
+---
+
+**Feature to document**
+
+<!-- Name of the feature(s) and a link to related pull request of the feature implementation. -->
+
+**Author(s)**
+
+<!-- Mention feature author(s) in order to know who is assignable for review outside of the documentation team. -->
+
+**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. -->

.gitignore

@@ -8,3 +8,5 @@ starter-kits-data.json
 .vscode
 .idea
 .DS_Store
+yarn-error.log
+package-lock.json

.npmrc

@@ -0,0 +1 @@
+package-lock=false

.travis.yml

@@ -5,10 +5,11 @@ branches:
 language: node_js
 node_js:
   - "8"
-script:
-  - bash ./src/scripts/deploy.sh
 sudo: required
 install:
-  - npm install --global yarn
   - yarn
   - sudo pip install proselint
+before_script:
+  - source ./src/scripts/env.sh
+script:
+  - bash ./src/scripts/deploy.sh

package.json

@@ -24,21 +24,26 @@
     "node": ">=6.9"
   },
   "scripts": {
-    "start": "npm run init:generated && npm run fetch && node ./antwar.bootstrap.js develop",
+    "start": "run-s -n init:generated fetch start-only",
     "start-only": "node ./antwar.bootstrap.js develop",
     "build": "npm run init:generated && npm run fetch && rm -rf build/ && node ./antwar.bootstrap.js build && npm run sitemap && echo webpack.js.org > build/CNAME",
     "build-test": "npm run build && http-server build/",
     "deploy": "gh-pages -d build",
     "fetch": "sh src/scripts/fetch.sh",
     "init:generated": "mkdirp ./generated/loaders && mkdirp ./generated/plugins ",
     "lint": "run-s lint:*",
-    "lint:js": "eslint . --ext .js --ext .jsx",
+    "lint:js": "eslint . --ext .js,.jsx,.md",
     "lint:markdown": "markdownlint --config ./.markdownlint.json *.md ./src/content/**/*.md",
     "lint:social": "alex . -q",
     "lint:prose": "cp .proselintrc ~/ && proselint src/content",
     "test": "npm run lint",
     "sitemap": "cd build && sitemap-static --prefix=https://webpack.js.org/ > sitemap.xml"
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm test"
+    }
+  },
   "devDependencies": {
     "alex": "^4.1.0",
     "antwar": "^0.28.3",
@@ -56,16 +61,17 @@
     "copy-webpack-plugin": "^4.4.2",
     "css-loader": "^0.28.10",
     "duplexer": "^0.1.1",
-    "eslint": "4.5.0",
+    "eslint": "4.19.1",
     "eslint-loader": "^2.0.0",
-    "eslint-plugin-markdown": "^1.0.0-beta.7",
+    "eslint-plugin-markdown": "git://github.com/byzyk/eslint-plugin-markdown.git#5927ccb78aff8a5464663730800503c6de3704e1",
     "file-loader": "^1.1.11",
     "fontgen-loader": "git://github.com/EugeneHlushko/fontgen-loader.git#a26a73843900ca4b518853952b1fc3c816103512",
     "front-matter": "^2.2.0",
     "gh-pages": "^1.0.0",
     "github": "^10.0.0",
     "html-webpack-plugin": "^3.1.0",
     "http-server": "^0.10.0",
+    "husky": "^1.0.0-rc.8",
     "hyperlink": "^3.0.1",
     "loader-utils": "^1.1.0",
     "lodash": "^4.17.4",

src/components/Contributors/Contributors.jsx

@@ -14,7 +14,7 @@ export default ({contributors}) => {
             <a key={ contributor }
               className="contributor"
               href={ `https://github.com/${contributor}` }>
-              <img src={ `https://github.com/${contributor}.png?size=90` } />
+              <img alt={ contributor } src={ `https://github.com/${contributor}.png?size=90` } />
               <span className="contributor__name"> {contributor}</span>
             </a>
           ))

src/components/Dropdown/Dropdown.jsx

@@ -22,7 +22,7 @@ export default class Dropdown extends React.Component {
           src={ LanguageIcon } />
         {/* Commented out until media breakpoints are in place
         <span>{ items[0].title }</span> */}
-        <i className="dropdown__arrow" />
+        <i aria-hidden="true" className="dropdown__arrow" />
 
         <div className={ `dropdown__list ${activeMod}` }>
           <ul>