Skip to content

Commit 958afb1

Browse files
committed
Merge branch 'release-10.0.0' into import-input-groups
2 parents 107d446 + 4b4d1cf commit 958afb1

File tree

98 files changed

+1986
-421
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+1986
-421
lines changed

.github/pull_request_template.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
First, change the base branch from "master" to "dev".
1+
- [ ] First, change the base branch from "master" to "dev".
22

3-
↑ Next, briefly describe your proposal in the title.
3+
- [ ] Next, briefly describe your proposal in the title.
4+
5+
- [ ] Fixes: # (type an issue number after the # if applicable)
46

57
Finally, tell us more about the change here, in the description.
68

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.DS_Store
22
.sass-cache
33
node_modules
4+
**/package-lock.json
45
*.log
56
build
67
_site

.storybook/.babelrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"presets": [
3+
"env",
4+
"react",
5+
"minify"
6+
]
7+
}

.storybook/Octicon.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,15 @@ export const Octicon = (props) => {
1313
}
1414

1515
const story = storiesOf('Octicons', module)
16-
const sizes = [64, 32, 16]
1716

1817
Object.keys(octicons).forEach(name => {
19-
story.add(name, () => (
20-
<div>{sizes.map((size, i) => (
21-
<Octicon name={name} width={size} height={size} key={i} />
22-
))}</div>
23-
))
18+
story.add(name, () => {
19+
return (
20+
<div>
21+
<Octicon name={name} height="64" />
22+
<Octicon name={name} height="32" />
23+
<Octicon name={name} height="16" />
24+
</div>
25+
)
26+
})
2427
})

.storybook/webpack.config.js

Lines changed: 37 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,43 @@ const path = require("path");
22

33
const modulesPath = path.resolve(__dirname, "../modules")
44

5-
module.exports = {
6-
module: {
7-
rules: [
8-
{
9-
test: /\.md$/,
10-
use: "raw-loader",
11-
},
12-
{
13-
test: /\.scss$/,
14-
loaders: [
15-
"style-loader",
16-
"css-loader",
17-
{
18-
loader: "postcss-loader",
19-
options: {
20-
config: {
21-
path: require.resolve("./postcss.config.js"),
22-
},
5+
module.exports = (config, env) => {
6+
7+
if (env === 'PRODUCTION') {
8+
config.plugins = config.plugins
9+
.filter(plugin => plugin.constructor.name !== 'UglifyJsPlugin')
10+
}
11+
12+
config.module.rules.push(
13+
{
14+
test: /\.md$/,
15+
use: "raw-loader",
16+
},
17+
{
18+
test: /\.scss$/,
19+
loaders: [
20+
"style-loader",
21+
"css-loader",
22+
{
23+
loader: "postcss-loader",
24+
options: {
25+
config: {
26+
path: require.resolve("./postcss.config.js"),
2327
},
2428
},
25-
{
26-
loader: "sass-loader",
27-
options: {
28-
includePaths: [
29-
modulesPath,
30-
],
31-
}
32-
},
33-
],
34-
include: modulesPath,
35-
},
36-
],
37-
},
29+
},
30+
{
31+
loader: "sass-loader",
32+
options: {
33+
includePaths: [
34+
modulesPath,
35+
],
36+
}
37+
},
38+
],
39+
include: modulesPath,
40+
}
41+
)
42+
43+
return config
3844
}

CHANGELOG.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,41 @@
1+
# 10.0.0
2+
3+
### Added
4+
- New module `primer-subhead`. The Subhead is a simple header with a bottom border. It&#39;s designed to be used on settings and configuration pages.
5+
6+
### Removed
7+
- Removing `primer-cards` module.
8+
- Removing `.form-cards` styles.
9+
10+
# 9.6.0
11+
12+
### Added
13+
- Storybook. We've added a storybook prototyping environment for testing components in seclusion. To start the server run `npm start`
14+
- Adding yeoman generator for creating a primer module. `generator-primer-module`
15+
- Importing `stylelint-config-primer` from https://github.com/primer/stylelint-config-primer/ into monorepo.
16+
- Importing `stylelint-selector-no-utility` from https://github.com/primer/stylelint-selector-no-utility into monorepo.
17+
18+
### Changes
19+
- Deployment and publishing scripts refinements.
20+
21+
# 9.5.0
22+
23+
### Added
24+
- 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
25+
26+
### Changes
27+
- Updates our release candidate versioning logic so that prerelease increments are done on a per-module basis, fixing #350.
28+
29+
# 9.4.0
30+
31+
### Added
32+
- Add `v-align-baseline` class to `primer-utilities` #324
33+
- Add deprecation warnings for `primer-cards` and `primer-forms/lib/form-validation.scss` #347 (these will be removed in v10.0.0)
34+
35+
### Changes
36+
- Update npm metadata for `primer-css`, `primer-core`, `primer-product`, and `primer-marketing` #328
37+
- Remove `HEAD` heading from the changelog #327
38+
139
# 9.3.0
240

341
## Added

lerna.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
2-
"lerna": "2.0.0-rc.5",
2+
"lerna": "2.4.0",
33
"packages": [
4-
"modules/*"
4+
"modules/*",
5+
"tools/*"
56
],
67
"version": "independent"
78
}

modules/primer-alerts/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.4.0",
2+
"version": "1.5.1",
33
"name": "primer-alerts",
44
"description": "Flash messages, or alerts, inform users of successful or pending actions.",
55
"homepage": "http://primercss.io/",
@@ -27,7 +27,7 @@
2727
"test": "../../script/npm-run-all build lint"
2828
},
2929
"dependencies": {
30-
"primer-support": "4.3.0"
30+
"primer-support": "4.4.1"
3131
},
3232
"keywords": [
3333
"alerts",

modules/primer-avatars/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.3.0",
2+
"version": "1.4.1",
33
"name": "primer-avatars",
44
"description": "Basic styles for user profile avatars.",
55
"homepage": "http://primercss.io/",
@@ -27,7 +27,7 @@
2727
"test": "../../script/npm-run-all build lint"
2828
},
2929
"dependencies": {
30-
"primer-support": "4.3.0"
30+
"primer-support": "4.4.1"
3131
},
3232
"keywords": [
3333
"avatars",

modules/primer-base/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.4.0",
2+
"version": "1.5.1",
33
"name": "primer-base",
44
"description": "CSS to reset the browsers default styles",
55
"homepage": "http://primercss.io/",
@@ -27,7 +27,7 @@
2727
"test": "../../script/npm-run-all build lint"
2828
},
2929
"dependencies": {
30-
"primer-support": "4.3.0"
30+
"primer-support": "4.4.1"
3131
},
3232
"keywords": [
3333
"primer",

0 commit comments

Comments
 (0)