Skip to content
This repository was archived by the owner on Sep 20, 2024. It is now read-only.

Commit d077ccd

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into develop
2 parents 157312f + 7b23cab commit d077ccd

File tree

293 files changed

+11684
-3639
lines changed

Some content is hidden

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

293 files changed

+11684
-3639
lines changed

.all-contributorsrc

Lines changed: 101 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,105 @@
192192
"contributions": [
193193
"doc",
194194
"content",
195-
"example"
195+
"example",
196+
"code"
197+
]
198+
},
199+
{
200+
"login": "odanado",
201+
"name": "odanado",
202+
"avatar_url": "https://avatars.githubusercontent.com/u/6040962?v=4",
203+
"profile": "https://github.com/odanado",
204+
"contributions": [
205+
"code",
206+
"tool"
207+
]
208+
},
209+
{
210+
"login": "IHIutch",
211+
"name": "Jonathan Hutchison",
212+
"avatar_url": "https://avatars.githubusercontent.com/u/20825047?v=4",
213+
"profile": "https://github.com/IHIutch",
214+
"contributions": [
215+
"code",
216+
"bug",
217+
"ideas",
218+
"test",
219+
"doc"
220+
]
221+
},
222+
{
223+
"login": "HoukasaurusRex",
224+
"name": "JT Houk",
225+
"avatar_url": "https://avatars.githubusercontent.com/u/23695312?v=4",
226+
"profile": "https://jt.houk.space/",
227+
"contributions": [
228+
"doc",
229+
"platform"
230+
]
231+
},
232+
{
233+
"login": "vincentpalma",
234+
"name": "Vincent Palma",
235+
"avatar_url": "https://avatars.githubusercontent.com/u/10133632?v=4",
236+
"profile": "https://github.com/vincentpalma",
237+
"contributions": [
238+
"doc"
239+
]
240+
},
241+
{
242+
"login": "MaySoMusician",
243+
"name": "MaySoMusician",
244+
"avatar_url": "https://avatars.githubusercontent.com/u/34566290?v=4",
245+
"profile": "https://github.com/MaySoMusician",
246+
"contributions": [
247+
"code"
248+
]
249+
},
250+
{
251+
"login": "MWFIAE",
252+
"name": "Martin",
253+
"avatar_url": "https://avatars.githubusercontent.com/u/6072971?v=4",
254+
"profile": "https://github.com/MWFIAE",
255+
"contributions": [
256+
"code",
257+
"test"
258+
]
259+
},
260+
{
261+
"login": "ejirocodes",
262+
"name": "Ejiro Asiuwhu",
263+
"avatar_url": "https://avatars.githubusercontent.com/u/45228014?v=4",
264+
"profile": "http://linkedin.com/in/ejiro-asiuwhu",
265+
"contributions": [
266+
"doc"
267+
]
268+
},
269+
{
270+
"login": "abelnnieva",
271+
"name": "Abel N. Nieva",
272+
"avatar_url": "https://avatars.githubusercontent.com/u/931497?v=4",
273+
"profile": "https://github.com/abelnnieva",
274+
"contributions": [
275+
"code"
276+
]
277+
},
278+
{
279+
"login": "simpletrontdip",
280+
"name": "Lê Thông",
281+
"avatar_url": "https://avatars.githubusercontent.com/u/20158564?v=4",
282+
"profile": "https://github.com/simpletrontdip",
283+
"contributions": [
284+
"code"
285+
]
286+
},
287+
{
288+
"login": "Pwuts",
289+
"name": "Reinier van der Leer",
290+
"avatar_url": "https://avatars.githubusercontent.com/u/12185583?v=4",
291+
"profile": "https://pwuts.nl/",
292+
"contributions": [
293+
"code"
196294
]
197295
}
198296
],
@@ -201,5 +299,6 @@
201299
"projectOwner": "chakra-ui",
202300
"repoType": "github",
203301
"repoHost": "https://github.com",
204-
"skipCi": true
302+
"skipCi": true,
303+
"commitConvention": "none"
205304
}

.changeset/config.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
{
2-
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
3-
"changelog": "@changesets/cli/changelog",
2+
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
3+
"changelog": [
4+
"@changesets/changelog-github",
5+
{ "repo": "chakra-ui/chakra-ui-vue" }
6+
],
47
"commit": false,
58
"linked": [],
6-
"access": "restricted",
9+
"access": "public",
710
"baseBranch": "master",
8-
"updateInternalDependencies": "patch"
11+
"updateInternalDependencies": "patch",
12+
"ignore": []
913
}

.codesandbox/ci.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"installCommand": "csb:install",
3+
"buildCommand": "build",
4+
"packages": [
5+
"packages/chakra-ui-core",
6+
"packages/chakra-ui-nuxt"
7+
],
8+
"sandboxes": ["chakra-ui-vue-0x-starter-template-2sy0g", "chakra-ui-nuxt-demo-f8tq4"],
9+
"node": "14"
10+
}

.eslintrc.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ module.exports = {
33
env: {
44
node: true
55
},
6-
plugins: ['testing-library'],
6+
plugins: [
7+
'testing-library',
8+
'@emotion'
9+
],
710
extends: [
811
'plugin:vue/essential',
912
'@vue/standard',
@@ -28,7 +31,8 @@ module.exports = {
2831
]
2932
}
3033
],
31-
'template-curly-spacing': 0
34+
'template-curly-spacing': 0,
35+
'@emotion/pkg-renaming': 'error'
3236
},
3337
parserOptions: {
3438
parser: 'babel-eslint'
Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
22
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
33

4-
name: Build & Test Components
4+
name: PR Workflow
55

66
on:
7-
# Trigger the workflow on push or pull request,
8-
# but only for the master branch
9-
push:
7+
pull_request:
108
branches:
9+
- master
1110
- develop
12-
pull_request:
11+
push:
1312
branches:
1413
- develop
1514

@@ -20,15 +19,24 @@ jobs:
2019
matrix:
2120
node-version: [12.x]
2221
steps:
23-
- uses: actions/checkout@v2
22+
- name: Checkout
23+
uses: actions/checkout@v2
24+
2425
- name: Use Node.js ${{ matrix.node-version }}
2526
uses: actions/setup-node@v1
2627
with:
2728
node-version: ${{ matrix.node-version }}
28-
- run: yarn
29-
- run: yarn bootstrap
30-
- run: yarn lint
31-
- run: yarn build --if-present
32-
- run: yarn test
29+
30+
- name: Install dependencies
31+
run: yarn install --frozen-lockfile && yarn bootstrap
32+
33+
- name: Lint types and code
34+
run: yarn lint
35+
36+
- name: Build packages
37+
run: yarn build
38+
39+
- name: Run tests
40+
run: yarn test
3341
env:
3442
CI: true

.github/workflows/release.yml

Lines changed: 44 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,58 @@
11
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
22
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
33

4-
name: Build & Test Components
4+
name: Release
55

66
on:
77
push:
8-
branches: [ master ]
9-
pull_request:
10-
branches: [ master ]
8+
paths:
9+
- "packages/**"
10+
branches:
11+
- master
1112

1213
jobs:
13-
build:
14+
release:
15+
name: Release
1416
runs-on: ubuntu-latest
15-
strategy:
16-
matrix:
17-
node-version: [12.x]
1817
steps:
19-
- uses: actions/checkout@v2
20-
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v1
18+
- name: Checkout Repo
19+
uses: actions/checkout@master
2220
with:
23-
node-version: ${{ matrix.node-version }}
24-
- run: yarn
25-
- run: yarn bootstrap
26-
- run: yarn lint
27-
- run: yarn build --if-present
28-
- run: yarn test
21+
# This makes Actions fetch all Git history
22+
# so that Changesets can generate changelogs with the correct commits
23+
fetch-depth: 0
24+
25+
- name: Use Node.js 12.x
26+
uses: actions/setup-node@master
27+
with:
28+
node-version: 12.x
29+
30+
- name: Install dependencies
31+
run: yarn install --frozen-lockfile && yarn bootstrap
32+
33+
34+
- name: Linting
35+
run: yarn lint
36+
37+
- name: Building packages
38+
run: yarn build
39+
40+
- name: Testing components
41+
run: yarn test
2942
env:
3043
CI: true
31-
release:
32-
name: Release
33-
runs-on: ubuntu-latest
34-
steps:
35-
- name: Checkout Repo
36-
uses: actions/checkout@v1
37-
- name: Setup Node.js
38-
uses: actions/setup-node@v1
39-
with:
40-
node-version: 12
41-
- name: Install Dependencies
42-
run: yarn
43-
- name: Create Release Pull Request
44-
uses: changesets/action@master
45-
env:
46-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47-
publish-npm:
48-
needs: build
49-
runs-on: ubuntu-latest
50-
steps:
51-
- uses: actions/checkout@v1
52-
- uses: actions/setup-node@v1
53-
with:
54-
node-version: 12
55-
registry-url: https://registry.npmjs.org/
56-
- run: yarn
57-
- run: yarn build
58-
- run: yarn publish-ci
59-
env:
60-
NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
6144

45+
- name: Setup CI Git User
46+
run: |
47+
git config --global user.name "codebender828"
48+
git config --global user.email "[email protected]"
49+
50+
- name: Publish packages
51+
uses: changesets/action@master
52+
with:
53+
publish: yarn release
54+
title: "chore(release): version packages"
55+
commit: "chore(release): version packages"
56+
env:
57+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
58+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,7 @@ lerna-debug.log
3535
.now
3636
config/.env
3737
packages/chakra-ui-nuxt/.github
38-
packages/chakra-ui-docs/static/sw.js
38+
packages/chakra-ui-docs/static/sw.js
39+
website/static/sw.js
40+
.npmrc
41+
**/static/sw.js

.npmrc

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

.storybook/assets/chakra.png

96.9 KB
Loading

0 commit comments

Comments
 (0)