Merge branch 'release-12.3.0' into more-pink

Author: shawnbot

RELEASING.md

@@ -1,15 +1,15 @@
 # Releasing a new version of Primer CSS 🎉
 
+## Prepare the release (in `primer/css`)
 
-## In this repo
+1. Decide which [PRs](https://github.com/primer/css/pulls) should be part of the next release and if it will be a major, minor or patch `<version>`. You may also check the [release tracking project
+](https://github.com/primer/css/projects/2#column-4482699) or ask your team members in Slack.
 
-1. Check off all of the boxes in your release PR.
+1. Create a new release branch from `master` and name it `release-<version>`.
 
-1. Test your changes with the latest release candidate version [in github/github](#in-github-github).
+1. Start merging existing PRs into the release branch. Note: You have to change the base branch from `master` to the `release-<version>` branch before merging.
 
-1. Once the release PR is approved and you've done necessary testing, merge it. After tests run, the site will be deployed and `@primer/css` will be published with your changes.
-
-1. Create a new release branch for the next release from `master` and name it `release-<version>`. Please use the following template for the PR description, linking to the relevant issues and/or pull requests for each change, and removing irrelevant headings:
+1. Create a new PR for the `release-<version>` branch. Please use the following template for the PR description, linking to the relevant issues and/or pull requests for each change, removing irrelevant headings and checking off all of the boxes of the ship checklist:
 
     ```md
     # Primer [Major|Minor|Patch] Release
@@ -25,13 +25,13 @@
 
     ### :bug: Bug Fix
     - [ ] Description #
-    
+
     ### :nail_care: Polish
     - [ ] Description #
-    
+
     ### :memo: Documentation
     - [ ] Description #
-    
+
     ### :house: Internal
     - [ ] Description #
 
@@ -40,58 +40,71 @@
     ### Ship checklist
 
     - [ ] Update `CHANGELOG.md`
-    - [ ] Update the `version` field in `package.json` to match the release version
-    - [ ] [Create a new release](https://github.com/primer/css/releases/new)
-    - [ ] [Update github/github](https://github.com/primer/css/blob/master/RELEASING.md#in-githubgithub)
-    - [ ] Create a new pull request for the next release
+    - [ ] Update the `version` field in `package.json`
+    - [ ] Test the release candidate version with `github/github`
+    - [ ] Merge this PR and [create a new release](https://github.com/primer/css/releases/new)
+    - [ ] Update `github/github`
+
+    For more details, see [RELEASING.md](https://github.com/primer/css/blob/master/RELEASING.md).
 
     /cc @primer/ds-core
     ```
 
+1. Update `CHANGELOG.md`
+
+1. Update the `version` field in `package.json` to match the release version. You may also run the `npm version v<version>` command.
+
 1. Wait for your checks to pass, and take note of the version that [primer/publish] lists in your status checks.
 
     **ProTip:** The release candidate version will always be `<version>-rc.<sha>`, where `<version>` comes from the branch name and `<sha>` is the 7-character commit SHA.
 
-### In `github/github`:
 
-1. Create a new branch.
+## Test the release candidate (in `github/github`):
+
+1. Create a new branch in the `github/github` repo, name it `primer-<version>`.
 
 1. Update the Primer CSS version to the published release candidate with:
 
     ```sh
     bin/npm install @primer/css@<version>-rc.<sha>
     ```
 
-    Then commit and push the changes to `package.json`, `package-lock.json`, and `vendor/npm`.
+    Then commit and push the changes to `package.json`, `package-lock.json`, `LICENSE` and `vendor/npm`.
 
 1. If you need to make changes to github/github due to the Primer release, do them in a branch and merge _that_ into your release branch after testing.
 
 1. Add or re-request reviewers and fix any breaking tests.
 
 1. Test on review-lab.
 
-1. Publish `@primer/css` to the `latest` dist-tag by merging the release branch and waiting for [primer/publish] to finish.
 
-1. Install the latest published version with:
+## Publish the release (in `primer/css`)
+
+1. If the release PR got approved and you've done necessary testing, merge it.
+
+    After tests run, the docs site will be deployed and `@primer/css` will be published with your changes to the `latest` dist-tag. You can check [npm](https://www.npmjs.com/package/@primer/css?activeTab=versions) to see if [primer/publish] has finished.
+
+1. [Create a new release](https://github.com/primer/primer/releases/new) with tag `v<version>`.
+
+1. Copy the changes from the [CHANGELOG] and paste them into the release notes.
+
+1. Publish 🎉
+
+
+## Update github.com (in `github/github`):
+
+1. Install the latest published version in the same `primer-<version>` branch created earlier with:
 
     ```
     bin/npm install @primer/css@<version>
     ```
 
-    Then commit and push the changes to `package.json`, `package-lock.json`, and `vendor/npm`.
+    Then commit and push the changes to `package.json`, `package-lock.json`, `LICENSE` and `vendor/npm`.
 
 1. Fix any breaking tests.
 
 1. Deploy! :rocket:
 
 
-### Publish the release
-
-1. [Create a new release](https://github.com/primer/primer/releases/new) with tag `v<version>`.
-
-2. Copy the changes from the [CHANGELOG] and paste them into the release notes.
-
-3. Publish 🎉
-
 [changelog]: ../CHANGELOG.md
 [primer/publish]: https://github.com/primer/publish

docs/markdown.js

@@ -1,15 +1,24 @@
 import React from 'react'
-import {Heading, Link} from '@primer/components'
+import {Link} from '@primer/components'
+import {MarkdownHeading} from '@primer/blueprints'
 import {CodeExample} from '@primer/blueprints/next-components'
 import Outline from './Outline'
 
-export const H1 = props => <Heading fontSize={6} fontWeight="light" {...props} />
+export const H1 = props => <MarkdownHeading {...props} />
+export const H2 = props => <MarkdownHeading as="h2" {...props} />
+export const H3 = props => <MarkdownHeading as="h3" {...props} />
+export const H4 = props => <MarkdownHeading as="h4" {...props} />
+export const H5 = props => <MarkdownHeading as="h5" {...props} />
 
 export default function getComponents(page = {}) {
   const {outline: getOutline = () => []} = page
 
   return {
     h1: H1,
+    h2: H2,
+    h3: H3,
+    h4: H4,
+    h5: H5,
     // render links with our component
     a: Link,
     // render code blocks with our wrapper around react-live