Merge branch 'release-10.0.0' into code_padding

Author: jonrohan

.github/pull_request_template.md

@@ -1,6 +1,8 @@
-↖ First, change the base branch from "master" to "dev".
+- [ ] First, change the base branch from "master" to "dev".
 
-↑ Next, briefly describe your proposal in the title.
+- [ ] Next, briefly describe your proposal in the title.
+
+- [ ] Fixes: #  (type an issue number after the # if applicable)
 
 Finally, tell us more about the change here, in the description.
 

.gitignore

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

.storybook/.babelrc

@@ -0,0 +1,7 @@
+{
+  "presets": [
+    "env",
+    "react",
+    "minify"
+  ]
+}

.storybook/Octicon.js

@@ -1,24 +1,27 @@
 import React from 'react'
 import {storiesOf} from '@storybook/react'
 import octicons from 'octicons'
-import SVGInline from 'react-svg-inline'
 
-const Octicon = (props) => {
+export const Octicon = (props) => {
   const {name} = props
   if (name in octicons) {
-    return <SVGInline svg={octicons[name].toSVG(props)} />
+    const svg = octicons[name].toSVG(props)
+    return <span dangerouslySetInnerHTML={ {__html: svg } }  />
   } else {
     throw new Error(`No such octicon: "${name}"!`)
   }
 }
 
 const story = storiesOf('Octicons', module)
-const sizes = [64, 32, 16]
 
 Object.keys(octicons).forEach(name => {
-  story.add(name, () => (
-    <div>{sizes.map((size, i) => (
-      <Octicon name={name} width={size} height={size} key={i} />
-    ))}</div>
-  ))
+  story.add(name, () => {
+    return (
+      <div>
+        <Octicon name={name} height="64" />
+        <Octicon name={name} height="32" />
+        <Octicon name={name} height="16" />
+      </div>
+    )
+  })
 })

.storybook/lib/storiesFromMarkdown.js

@@ -4,11 +4,23 @@ import select from 'unist-util-select'
 import findBefore from 'unist-util-find-before'
 import htmlToReact from 'html-to-react'
 import parsePairs from 'parse-pairs'
+import React from 'react'
+import ReactDOMServer from 'react-dom/server'
+import {Octicon} from '../Octicon'
 
 const htmlParser = new htmlToReact.Parser()
 
+const railsOcticonToReact = (html) => {
+  // <%= octicon "tools" %> to <Octicon name="tools" />
+  const octre = /<%= octicon ["']([a-z\-]+)["'][^%]*%>/gi
+  html = html.replace(octre, (match, name) => {
+    return ReactDOMServer.renderToStaticMarkup(<Octicon name={name} />)
+  })
+  return html
+}
+
 const nodeToStory = (node, file) => {
-  const html = node.value
+  const html = railsOcticonToReact(node.value)
   const element = htmlParser.parse(html)
   const pairs = node.lang.replace(/^html\s*/, '')
   const attrs = pairs.length ? parsePairs(pairs) : {}

.storybook/preview-head.html

@@ -1 +1,2 @@
+<link rel="stylesheet" href="https://unpkg.com/octicons@7.0.1/build/build.css">
 <script src="https://github.com/site/assets/styleguide.js" async></script>

.storybook/webpack.config.js

@@ -2,37 +2,43 @@ const path = require("path");
 
 const modulesPath = path.resolve(__dirname, "../modules")
 
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: /\.md$/,
-        use: "raw-loader",
-      },
-      {
-        test: /\.scss$/,
-        loaders: [
-          "style-loader",
-          "css-loader",
-          {
-            loader: "postcss-loader",
-            options: {
-              config: {
-                path: require.resolve("./postcss.config.js"),
-              },
+module.exports = (config, env) => {
+
+  if (env === 'PRODUCTION') {
+    config.plugins = config.plugins
+      .filter(plugin => plugin.constructor.name !== 'UglifyJsPlugin')
+  }
+
+  config.module.rules.push(
+    {
+      test: /\.md$/,
+      use: "raw-loader",
+    },
+    {
+      test: /\.scss$/,
+      loaders: [
+        "style-loader",
+        "css-loader",
+        {
+          loader: "postcss-loader",
+          options: {
+            config: {
+              path: require.resolve("./postcss.config.js"),
             },
           },
-          {
-            loader: "sass-loader",
-            options: {
-              includePaths: [
-                modulesPath,
-              ],
-            }
-          },
-        ],
-        include: modulesPath,
-      },
-    ],
-  },
+        },
+        {
+          loader: "sass-loader",
+          options: {
+            includePaths: [
+              modulesPath,
+            ],
+          }
+        },
+      ],
+      include: modulesPath,
+    }
+  )
+
+  return config
 }

CHANGELOG.md

@@ -1,3 +1,47 @@
+# 10.0.0
+
+### Added
+- New module `primer-subhead`. The Subhead is a simple header with a bottom border. It's designed to be used on settings and configuration pages.
+- Importing `.input-group` into `primer-forms` module.
+- New module `primer-branch-name` "A nice, consistent way to display branch names."
+
+### Removed
+- Removing `primer-cards` module.
+- Removing `.form-cards` styles.
+
+### Changes
+- Moving `primer-breadcrumb` from `primer-marketing` to `primer-core`
+- added `border-radius: 0` to `button` to account for updates in Chroma 62 macOS
+
+# 9.6.0
+
+### Added
+- Storybook. We've added a storybook prototyping environment for testing components in seclusion. To start the server run `npm start`
+- Adding yeoman generator for creating a primer module. `generator-primer-module`
+- Importing `stylelint-config-primer` from https://github.com/primer/stylelint-config-primer/ into monorepo.
+- Importing `stylelint-selector-no-utility` from https://github.com/primer/stylelint-selector-no-utility into monorepo.
+
+### Changes
+- Deployment and publishing scripts refinements.
+
+# 9.5.0
+
+### Added
+- It's now possible to style `<summary>` elements as buttons and have them appear in the active/selected state when the enclosing [`<details>` element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/details) is open. #346
+
+### Changes
+- Updates our release candidate versioning logic so that prerelease increments are done on a per-module basis, fixing #350.
+
+# 9.4.0
+
+### Added
+- Add `v-align-baseline` class to `primer-utilities` #324
+- Add deprecation warnings for `primer-cards` and `primer-forms/lib/form-validation.scss` #347 (these will be removed in v10.0.0)
+
+### Changes
+- Update npm metadata for `primer-css`, `primer-core`, `primer-product`, and `primer-marketing` #328
+- Remove `HEAD` heading from the changelog #327
+
 # 9.3.0
 
 ## Added

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 GitHub Inc.
+Copyright (c) 2017 GitHub Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

lerna.json

@@ -1,7 +1,8 @@
 {
-  "lerna": "2.0.0-rc.5",
+  "lerna": "2.4.0",
   "packages": [
-    "modules/*"
+    "modules/*",
+    "tools/*"
   ],
   "version": "independent"
 }