Skip to content

Commit 2f013ed

Browse files
committed
Merge branch 'develop' into stable
2 parents ff3f3aa + 7ab0be9 commit 2f013ed

File tree

146 files changed

+2265
-2757
lines changed

Some content is hidden

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

146 files changed

+2265
-2757
lines changed

.all-contributorsrc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,6 +1044,17 @@
10441044
"code",
10451045
"bug"
10461046
]
1047+
},
1048+
{
1049+
"login": "carolinmaisenbacher",
1050+
"name": "Carolin Maisenbacher",
1051+
"avatar_url": "https://avatars.githubusercontent.com/u/32734844?v=4",
1052+
"profile": "https://github.com/carolinmaisenbacher",
1053+
"contributions": [
1054+
"code",
1055+
"doc",
1056+
"test"
1057+
]
10471058
}
10481059
]
10491060
}

.github/workflows/ci.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,12 @@ jobs:
3434
if: >
3535
!contains(github.event.head_commit.message, 'ci skip') &&
3636
!contains(github.event.head_commit.message, 'skip ci') &&
37-
!contains(github.event.head_commit.message, 'chore') && (
37+
!startsWith(github.event.head_commit.message, 'chore') &&
38+
!startsWith(github.event.pull_request.title, 'chore') && (
3839
github.event_name == 'push' ||
3940
github.event.pull_request.head.repo.full_name == github.repository
4041
)
4142
steps:
42-
- name: Dump GitHub event
43-
env:
44-
GITHUB_EVENT: ${{ toJSON(github.event) }}
45-
run: echo "$GITHUB_EVENT"
46-
4743
- uses: actions/checkout@v2
4844

4945
- name: Prepare repository

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## UNRELEASED
4+
5+
- Set `gatsby` peerDependency more explicit to `^2.0.0 || ^3.0.0`. [#1640](https://github.com/system-ui/theme-ui/pull/1640) ([@LekoArts](https://github.com/LekoArts))
6+
- Have `breakpoints` accept custom media queries [#1653](https://github.com/system-ui/theme-ui/pull/1653) [@carolinmaisenbacher](https://github.com/carolinmaisenbacher)
7+
38
## v0.6.2 (Mon Apr 05 2021)
49

510
### 🐛 Bug Fix

auto.config.ts

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import { AutoRc } from '@auto-it/core'
2+
3+
import { INpmConfig } from '@auto-it/npm'
4+
import { IAllContributorsPluginOptions } from '@auto-it/all-contributors'
5+
6+
const npmOptions: INpmConfig = {
7+
exact: true,
8+
}
9+
10+
const allContributorsOptions: IAllContributorsPluginOptions = {
11+
exclude: ['dependabot', 'dependabot-preview'],
12+
types: {
13+
infra: ['./github/**/*'],
14+
example: ['examples/**/*'],
15+
doc: ['**/*.mdx', '**/*.md', 'packages/docs/**/*'],
16+
test: ['**/*.test.*', '**/*.spec.*'],
17+
code: [
18+
'packages/**/*.js',
19+
'packages/**/*.ts',
20+
'packages/**/*.jsx',
21+
'packages/**/*.tsx',
22+
'**/package.json',
23+
'**/tsconfig.json',
24+
],
25+
},
26+
}
27+
28+
export default function config(): AutoRc {
29+
return {
30+
baseBranch: 'stable',
31+
prereleaseBranches: ['develop'],
32+
plugins: [
33+
['npm', npmOptions],
34+
'conventional-commits',
35+
'first-time-contributor',
36+
'released',
37+
['all-contributors', allContributorsOptions],
38+
],
39+
}
40+
}

auto.rc

Lines changed: 0 additions & 36 deletions
This file was deleted.

deprecated/chrome/babel.config.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

deprecated/chrome/package.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"private": true,
33
"name": "@theme-ui/chrome",
44
"version": "0.5.0-alpha.0",
5-
"main": "index.js",
5+
"main": "dist/chrome.cjs.js",
66
"author": "Brent Jackson",
77
"license": "MIT",
88
"scripts": {
@@ -18,7 +18,6 @@
1818
"@babel/core": "^7.4.5",
1919
"@babel/preset-env": "^7.4.5",
2020
"@babel/preset-react": "^7.0.0",
21-
"@emotion/react": "^11.1.1",
2221
"@theme-ui/editor": "^0.5.0-alpha.0",
2322
"babel-loader": "^8.0.6",
2423
"copy-to-clipboard": "^3.2.0",
@@ -29,10 +28,9 @@
2928
"stringify-object": "^3.3.0",
3029
"theme-ui": "^0.5.0-alpha.0",
3130
"webpack": "^4.33.0",
32-
"webpack-cli": "^3.3.4"
31+
"webpack-cli": "^3.3.4",
32+
"@emotion/react": "^11.1.1"
3333
},
34-
"devDependencies": {
35-
"@theme-ui/css": "^0.5.0-alpha.0"
36-
},
37-
"gitHead": "bfd026cae085f377ca537de897dc43233d50f5d5"
34+
"gitHead": "bfd026cae085f377ca537de897dc43233d50f5d5",
35+
"module": "dist/chrome.esm.js"
3836
}

deprecated/chrome/tsconfig.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

deprecated/chrome/webpack.config.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

deprecated/gatsby-theme-ui-blog/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"avatar": "npx capture-website-cli \"https://contrast.now.sh/fff/33e?text=UI&size=48&fontSize=1.5&radius=32&baseline=1\" content/assets/avatar.png --width=48 --height=48 --overwrite"
88
},
99
"peerDependencies": {
10-
"gatsby": ">=2",
10+
"gatsby": "^2.0.0 || ^3.0.0",
1111
"react": "^16.14.0 || ^17.0.0",
1212
"react-dom": "^16.8.0 || ^17.0.0"
1313
},

0 commit comments

Comments
 (0)