Merge branch 'release-13.1.0' into upgrade-styled-system

CONTRIBUTING.md

@@ -51,8 +51,8 @@ A code coverage report is included in the `npm test` output, and test coverage d
 
 ## Tools we use
 
-1. We use [styled-components] to style our components.
-2. We use style functions from [styled-system] whenever possible, and styled-systems' `style()` function to create new ones.
+1. We use [styled-components](https://www.styled-components.com/) to style our components.
+2. We use style functions from [styled-system](https://styled-system.com/) whenever possible, and styled-systems' `style()` function to create new ones.
 
 
 ## Component patterns

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primer/components",
-  "version": "13.0.0",
+  "version": "13.1.0",
   "description": "Primer react components",
   "main": "dist/index.umd.js",
   "module": "dist/index.esm.js",
@@ -90,11 +90,11 @@
     "rollup-plugin-commonjs": "9.1.3",
     "sass.macro": "0.1.0",
     "styled-components": "4.1.2",
-    "@githubprimer/octicons-react": "8.1.2"
+    "@primer/octicons-react": "9.0.0"
   },
   "peerDependencies": {
     "styled-components": "4.x",
-    "@githubprimer/octicons-react": "8.x",
-    "react": "16.8.x"
+    "@primer/octicons-react": "9.x",
+    "react": "^16.8.0"
   }
 }

pages/_app.js

@@ -4,7 +4,7 @@ import {MDXProvider} from '@mdx-js/tag'
 import Head from 'next/head'
 import {withMDXLive} from 'mdx-live'
 import getConfig from 'next/config'
-import Octicon, {iconsByName, Pencil} from '@githubprimer/octicons-react'
+import Octicon, {iconsByName, Pencil} from '@primer/octicons-react'
 import * as docComponents from './doc-components'
 import * as primerComponents from '..'
 import {repository} from '../package.json'

pages/doc-components/Header.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import {withRouter} from 'next/router'
-import Octicon, {MarkGithub} from '@githubprimer/octicons-react'
+import Octicon, {MarkGithub} from '@primer/octicons-react'
 import NextLink from 'next/link'
 import BoxShadow from './BoxShadow'
 import {Text, Flex, Link, Sticky, Box} from '../..'

rollup.config.js

@@ -10,7 +10,7 @@ export default [
     plugins,
     external: [
       "styled-components",
-      "@githubprimer/octicons-react",
+      "@primer/octicons-react",
       "react"
     ],
     output: formats.map(format => ({

src/CircleBadge.js

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types'
 import styled from 'styled-components'
-import Octicon from '@githubprimer/octicons-react'
+import Octicon from '@primer/octicons-react'
 import {COMMON, get} from './constants'
 import theme from './theme'
 

src/CircleOcticon.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import Octicon from '@githubprimer/octicons-react'
+import Octicon from '@primer/octicons-react'
 import Flex from './Flex'
 import theme from './theme'
 import BorderBox from './BorderBox'

src/StateLabel.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import styled from 'styled-components'
-import {GitMerge, GitPullRequest, IssueClosed, IssueOpened} from '@githubprimer/octicons-react'
+import {GitMerge, GitPullRequest, IssueClosed, IssueOpened} from '@primer/octicons-react'
 import theme, {colors} from './theme'
 import {COMMON} from './constants'
 import StyledOcticon from './StyledOcticon'

src/StyledOcticon.js

@@ -1,4 +1,4 @@
-import Octicon from '@githubprimer/octicons-react'
+import Octicon from '@primer/octicons-react'
 import PropTypes from 'prop-types'
 import styled from 'styled-components'
 import {COMMON} from './constants'

src/__tests__/CircleOcticon.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import {Check} from '@githubprimer/octicons-react'
+import {Check} from '@primer/octicons-react'
 import {colors} from '../theme'
 import CircleOcticon from '../CircleOcticon'
 import {render} from '../utils/testing'

src/__tests__/StyledOcticon.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import {X} from '@githubprimer/octicons-react'
+import {X} from '@primer/octicons-react'
 import StyledOcticon from '../StyledOcticon'
 import {render} from '../utils/testing'
 import {COMMON} from '../constants'

src/constants.js

@@ -31,6 +31,7 @@ export const TYPOGRAPHY = styledSystem.typography
 export const LAYOUT = styledSystem.layout
 export const POSITION = styledSystem.position
 
+
 TYPOGRAPHY.propTypes = systemPropTypes.typography
 LAYOUT.propTypes = systemPropTypes.layout
 POSITION.propTypes = systemPropTypes.position