Merge remote-tracking branch 'origin/release-11.0.0' into rm-primer-p…

…age-headers

.github/CONTRIBUTING.md

@@ -1,34 +1,31 @@
 ## Contributing
 
-[fork]: https://github.com/github/primer/fork
-[pr]: https://github.com/github/primer/compare
-[style]: http://primer.github.io/guidelines/
+[fork]: https://github.com/primer/primer/fork
+[pr]: https://github.com/primer/primer/compare
+[style]: https://styleguide.github.com/primer/principles/
 
 Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great.
 
-Before you do, would you mind reading [this license agreement](CLA.md)? If you open a PR, we'll assume you agree to it. If you have any hesitation or disagreement, please do open a PR still, but note your concerns as well.
-
 ## Using the issue tracker
 
 The issue tracker is the preferred channel for [bug reports](#bug-reports), [features requests](#feature-requests) and [submitting pull requests](#pull-requests), but please respect the following restrictions:
 
 * Please **do not** use the issue tracker for personal support requests.
 * Please **do not** derail or troll issues. Keep the discussion on topic and respect the opinions of others.
-* Please **do not** open issues or pull requests regarding the code in [`Normalize`](https://github.com/necolas/normalize.css) (open them in their respective repositories).
 
 ## Bug reports
 
 A bug is a _demonstrable problem_ that is caused by the code in the repository. Good bug reports are extremely helpful, so thanks!
 
 Guidelines for bug reports:
 
-0. **Validate and lint your code** — [validate your HTML](http://html5.validator.nu) to ensure your problem isn't caused by a simple error in your own code.
+1. **Validate and lint your code** — [validate your HTML](http://html5.validator.nu) to ensure your problem isn't caused by a simple error in your own code.
 
-1. **Use the GitHub issue search** — check if the issue has already been reported.
+2. **Use the GitHub issue search** — check if the issue has already been reported.
 
-2. **Check if the issue has been fixed** — try to reproduce it using the latest `master` or development branch in the repository.
+3. **Check if the issue has been fixed** — try to reproduce it using the latest `master` branch in the repository.
 
-3. **Isolate the problem** — ideally create a [reduced test case](http://css-tricks.com/6263-reduced-test-cases/) and a live example.
+4. **Isolate the problem** — ideally create a [reduced test case](https://css-tricks.com/reduced-test-cases/) and a live example.
 
 A good bug report shouldn't leave others needing to chase you up for more information. Please try to be as detailed as possible in your report. What is your environment? What steps will reproduce the issue? What browser(s) and OS experience the problem? Do other browsers show the bug differently? What would you expect to be the outcome? All these details will help people to fix any potential bugs.
 
@@ -59,14 +56,13 @@ Good pull requests—patches, improvements, new features—are a fantastic help.
 
 ### Updating Primer modules
 
-Anyone can open a pull request on Primer. You do not need to work at GitHub or be a member of the org to open a pull request. 
+Anyone can open a pull request on Primer. You do not need to work at GitHub or be a member of the org to open a pull request.
 
 1. Fork and clone [this repository](https://github.com/primer/primer).
 2. Configure and install the dependencies: `npm install`
-3. Check out the dev branch `git checkout dev`
-3. Create a new branch from dev `git checkout -b my-branch-name`
+3. Create a new branch from master `git checkout -b my-branch-name`
 4. Make your changes and commit them.
-5. Push your branch and open a pull request against `dev`. Add a comment describing your proposed changes and request a review from `@primer/ds-core`.
+5. Push your branch and open a pull request. Add a comment describing your proposed changes and request a review from `@primer/ds-core`.
 6. Wait for CI tests to finish.
    - If the tests pass, you should see a status check telling you which alpha version of primer you can install with npm to test your work in other projects.
    - If the tests fail, review the logs and address any issues.
@@ -79,6 +75,111 @@ Here are a few things you can do that will increase the likelihood of your pull
 - Keep your change as focused as possible. If there are multiple changes you would like to make that are not dependent upon each other, consider submitting them as separate pull requests.
 - Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 
+## Releasing a new Primer version 🎉
+
+This section is targeted at maintainers of primer, to instruct them on the processes for releasing a new version.
+
+### In `primer/primer`:
+
+1. Find or create a new pull request with a release branch from `master` and name it `release-<version>`.
+
+ (CI will publish a release candidate version to npm for branches prefixed with `release`. These version numbers have a `rc.<number>` suffix on them)
+
+ For the pull request you can use the following template.
+
+ ```md
+  # Primer Minor Release
+
+  Tracking Issue for next release: 📦 **0.0.0**
+  Approximate release date: 📆
+
+  ### Must
+
+  - [ ]
+
+  ### Should
+
+  - [ ]
+
+  ### Could
+
+  - [ ]
+
+  ----
+
+  ### Ship checklist
+
+  - [ ] Update CHANGELOG
+  - [ ] Run version bump
+  - [ ] Update primer.github.io
+  - [ ] Update github/github
+  - [ ] Update the style guide
+  - [ ] Update the release tag note
+  - [ ] Create a new pull request for the next release
+
+  /cc @primer/ds-core
+ ```
+
+2. Go through the tracking issue and make sure everything that should be merged in is merged in.
+
+3. Once your builds finish, click on the details links for the continuous-integration/travis-ci/push build.  Expand the `Deploying application` output and you should be able to find an outputted change log here. Copy this and update the [CHANGELOG.md](https://github.com/primer/primer/blob/master/CHANGELOG.md) file.
+
+4. Run the version bump in your terminal: `npm run bump`.
+
+5. Test your changes with the latest release candidate version in the appropriate places (styleguide, storybook, github/github).
+
+6. Once the release PR is approved and you've done necessary testing, merge to `master`. This will trigger a publish to npm.
+
+### In `github/github`:
+
+1. Create a new branch
+
+2. Update the primer version in your terminal  `bin/npm install primer@<version>`.
+
+3. Update `stylelint-config-primer` in your terminal to the appropriate version `bin/npm install stylelint-config-primer@latest`.
+
+4. If you need to make changes to github/github due to the Primer release, make a separate branch. When ready, merge that branch into your release branch.
+
+5. Add reviewers.
+
+6. Check that every deleted vendor file has an accompanying updated vendor file and that the version numbers look correct.
+
+7. Test on review-lab.
+
+8. When ready, merge! 🎉
+
+
+## Other items that need to be done after publishing Primer
+
+#### Update the Style Guide
+
+1. In [github/styleguide](https://github.com/github/styleguide), update `primer` to your newly released version in your terminal:
+
+  `npm install primer@latest`
+
+2. Then  run: `script/update-primer-docs`.
+
+3. Commit changes, make PR, get it approved, merge! 🚀
+
+#### Update [primer.github.io](primer.github.io)
+
+1. Edit  [index.html](https://github.com/primer/primer.github.io/blob/master/index.html) to include the latest version.
+
+#### Update Storybook
+
+1. Pull the latest from master on primer/primer (after merging in release branch).
+
+2. Run `npm run publish-storybook`.
+
+#### Publish release tag
+
+1. Create a new release tag [here](https://github.com/primer/primer/releases/new).
+
+2. Copy the changes from the [CHANGELOG](https://github.com/primer/primer/blob/master/CHANGELOG.md) and paste it into the release notes.
+
+3. Publish 🎉
+
+
 ## Resources
 
 - [Contributing to Open Source on GitHub](https://guides.github.com/activities/contributing-to-open-source/)

.github/ISSUE_TEMPLATE/primer-bug-report.md

@@ -0,0 +1,35 @@
+---
+name: Primer bug report
+about: Create a report to help us improve primer
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/primer-feature-request.md

@@ -0,0 +1,17 @@
+---
+name: Primer feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/style-guide-bug-report.md

@@ -0,0 +1,35 @@
+---
+name: Style guide bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/pull_request_template.md

@@ -1,6 +1,4 @@
-- [ ] First, change the base branch from "master" to "dev".
-
-- [ ] Next, briefly describe your proposal in the title.
+- [ ] First, briefly describe your proposal in the title.
 
 - [ ] Fixes: #  (type an issue number after the # if applicable)
 

.gitignore

@@ -1,7 +1,6 @@
 .DS_Store
 .sass-cache
 node_modules
-**/package-lock.json
 *.log
 build
 _site

.npmrc

@@ -0,0 +1,2 @@
+save=true
+save-exact=true

.nvmrc

@@ -0,0 +1 @@
+8

.storybook/lib/storiesFromMarkdown.js

@@ -19,17 +19,22 @@ const railsOcticonToReact = (html) => {
   return html
 }
 
-const nodeToStory = (node, file) => {
-  const html = railsOcticonToReact(node.value)
-  const element = htmlParser.parse(html)
+const parseBlockAttrs = (node, file) => {
   const pairs = node.lang.replace(/^html\s*/, '')
   const attrs = pairs.length ? parsePairs(pairs) : {}
-  const title = attrs.title || getPreviousHeading(node) ||
-    `story @ ${file}:${node.position.start.line}`
+  attrs.title = attrs.title
+    || getPreviousHeading(node)
+    || `story @ ${file}:${node.position.start.line}`
+  node.block = attrs
+  return node
+}
+
+const nodeToStory = (node, file) => {
+  const html = railsOcticonToReact(node.value)
+  const {title} = node.block
   return {
     title,
-    story: () => element,
-    attrs,
+    story: () => htmlParser.parse(html),
     html,
     file,
     node,
@@ -44,14 +49,17 @@ const getPreviousHeading = node => {
 }
 
 export default req => {
-  return req.keys().reduce((stories, file) => {
-    const content = req(file)
-    const ast = parents(remark.parse(content))
-    const path = file.replace(/^\.\//, '')
-    return stories.concat(
-      select(ast, 'code[lang^=html]')
-        .map(node => nodeToStory(node, path))
-        .filter(({attrs}) => attrs.story !== "false")
-    )
-  }, [])
+  return req.keys()
+    .filter(file => !file.match(/node_modules/))
+    .reduce((stories, file) => {
+      const content = req(file)
+      const ast = parents(remark.parse(content))
+      const path = file.replace(/^\.\//, '')
+      return stories.concat(
+        select(ast, 'code[lang^=html]')
+          .map(parseBlockAttrs)
+          .filter(({block}) => block.story !== "false")
+          .map(node => nodeToStory(node, path))
+      )
+    }, [])
 }

.storybook/webpack.config.js

@@ -1,6 +1,6 @@
-const path = require("path");
+const path = require('path');
 
-const modulesPath = path.resolve(__dirname, "../modules")
+const modulesPath = path.resolve(__dirname, '../modules')
 
 module.exports = (config, env) => {
 
@@ -9,26 +9,34 @@ module.exports = (config, env) => {
       .filter(plugin => plugin.constructor.name !== 'UglifyJsPlugin')
   }
 
-  config.module.rules.push(
-    {
-      test: /\.md$/,
-      use: "raw-loader",
-    },
+  const rules = config.module.rules
+
+  rules.forEach((rule, index) => {
+    if ('README.md'.match(rule.test)) {
+      // console.warn('replacing MD rule:', rule)
+      rules.splice(index, 1, {
+        test: /\.md$/,
+        loader: 'raw-loader',
+      })
+    }
+  })
+
+  rules.push(
     {
       test: /\.scss$/,
       loaders: [
-        "style-loader",
-        "css-loader",
+        'style-loader',
+        'css-loader',
         {
-          loader: "postcss-loader",
+          loader: 'postcss-loader',
           options: {
             config: {
-              path: require.resolve("./postcss.config.js"),
+              path: require.resolve('./postcss.config.js'),
             },
           },
         },
         {
-          loader: "sass-loader",
+          loader: 'sass-loader',
           options: {
             includePaths: [
               modulesPath,