Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
jonrohan committed Nov 14, 2017
2 parents dd641e6 + c865391 commit 5ee6c2b
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 13 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 10.0.1 (2017-11-14)

#### :bug: Bug Fix

* Fixing `peerDependencies` to be greater than equal to versions. Fixing version mismatch with buttons and box.

# 10.0.0 (2017-11-13)

#### :boom: Breaking Change
Expand Down
4 changes: 2 additions & 2 deletions modules/primer-marketing-buttons/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0",
"version": "1.0.1",
"name": "primer-marketing-buttons",
"description": "Buttons for marketing websites at GitHub",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -31,7 +31,7 @@
"primer-support": "4.4.2"
},
"peerDependencies": {
"primer-buttons": "2.4.1"
"primer-buttons": ">=2.5.0"
},
"keywords": [
"css",
Expand Down
4 changes: 2 additions & 2 deletions modules/primer-marketing/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "6.0.0",
"version": "6.0.1",
"name": "primer-marketing",
"description": "Primer marketing packages",
"homepage": "http://primer.github.io/",
Expand All @@ -26,7 +26,7 @@
"lint": "../../script/lint-scss"
},
"dependencies": {
"primer-marketing-buttons": "1.0.0",
"primer-marketing-buttons": "1.0.1",
"primer-marketing-support": "1.3.2",
"primer-marketing-type": "1.4.2",
"primer-marketing-utilities": "1.5.0",
Expand Down
4 changes: 2 additions & 2 deletions modules/primer-popover/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.0.2",
"version": "0.0.3",
"name": "primer-popover",
"description": "Popover for suggesting, guiding, and bringing attention to specific UI elements on a page.",
"homepage": "http://primer.github.io/",
Expand All @@ -26,7 +26,7 @@
"primer-support": "4.4.2"
},
"peerDependencies": {
"primer-box": "2.5.1"
"primer-box": ">=2.5.0"
},
"keywords": [
"github",
Expand Down
4 changes: 2 additions & 2 deletions modules/primer-product/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "5.5.0",
"version": "5.5.1",
"name": "primer-product",
"description": "Primer's product modules",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -32,7 +32,7 @@
"primer-branch-name": "1.0.0",
"primer-labels": "1.5.2",
"primer-markdown": "3.7.2",
"primer-popover": "0.0.2",
"primer-popover": "0.0.3",
"primer-subhead": "1.0.0",
"primer-support": "4.4.2"
}
Expand Down
10 changes: 5 additions & 5 deletions modules/primer/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "10.0.0",
"version": "10.0.1",
"name": "primer",
"description": "Primer is the CSS framework that powers GitHub's front-end design. primer includes 23 packages that are grouped into 3 core meta-packages for easy install. Each package and meta-package is independently versioned and distributed via npm, so it's easy to include all or part of Primer within your own project.",
"homepage": "http://primer.github.io/",
Expand Down Expand Up @@ -40,16 +40,16 @@
"primer-labels": "1.5.2",
"primer-layout": "1.4.2",
"primer-markdown": "3.7.2",
"primer-marketing": "6.0.0",
"primer-marketing-buttons": "1.0.0",
"primer-marketing": "6.0.1",
"primer-marketing-buttons": "1.0.1",
"primer-marketing-support": "1.3.2",
"primer-marketing-type": "1.4.2",
"primer-marketing-utilities": "1.5.0",
"primer-navigation": "1.5.0",
"primer-page-headers": "1.4.2",
"primer-page-sections": "1.4.2",
"primer-popover": "0.0.2",
"primer-product": "5.5.0",
"primer-popover": "0.0.3",
"primer-product": "5.5.1",
"primer-subhead": "1.0.0",
"primer-support": "4.4.2",
"primer-table-object": "1.4.2",
Expand Down

0 comments on commit 5ee6c2b

Please sign in to comment.