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

Commit c970707

Browse files
codebender828codebender828
authored
Merge pull request #365 from chakra-ui/develop
chore: bump version
2 parents ce6c8ad + 132cf56 commit c970707

File tree

15 files changed

+83
-138
lines changed

15 files changed

+83
-138
lines changed

‎.github/workflows/release.yml‎

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,57 +5,58 @@ name: Build & Test Components
55

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

1213
jobs:
13-
build:
14+
release:
15+
name: Release
1416
runs-on: ubuntu-latest
1517
strategy:
1618
matrix:
17-
node-version: [12.x]
19+
node-version: 12.x
1820
steps:
19-
- uses: actions/checkout@v2
21+
- name: Checkout Repo
22+
uses: actions/checkout@master
23+
with:
24+
# This makes Actions fetch all Git history
25+
# so that Changesets can generate changelogs with the correct commits
26+
fetch-depth: 0
27+
2028
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v1
29+
uses: actions/setup-node@master
2230
with:
2331
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
32+
33+
- name: Install dependencies
34+
run: yarn
35+
36+
- name: Bootstrap
37+
run: yarn bootstrap
38+
39+
- name: Linting
40+
run: yarn lint
41+
42+
- name: Testing components
43+
run: yarn test
2944
env:
3045
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 }}
6146

47+
- name: Building packages
48+
run: yarn build --if-present
49+
50+
- name: Setup CI Git User
51+
run: |
52+
git config --global user.email "jbakebwa@gmail.com"
53+
git config --global user.name "codebender828"
54+
55+
- name: Publish packages
56+
uses: changesets/action@master
57+
with:
58+
publish: yarn release
59+
commit: "chore(release): version packages"
60+
env:
61+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
62+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,5 @@ 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

‎package.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@
3030
"test:core": "jest",
3131
"test:module": "yarn workspace @chakra-ui/nuxt test",
3232
"test": "yarn test:core && yarn test:module",
33-
"publish-ci": "lerna publish from-package -y --no-verify-access",
34-
"release": "lerna version patch && lerna publish from-package",
35-
"push": "git add -A && git commit -m \"chore(lerna): publishing package \" && lerna version --conventional-commits",
33+
"release": "changeset publish",
3634
"clean": "lerna run clean",
3735
"storybook": "cross-env STORYBOOK_VUE_DEV_TOOLS=1 start-storybook -p 9000",
3836
"storybook:devtools": "vue-devtools",
@@ -83,7 +81,6 @@
8381
"lint-staged": "^9.4.2",
8482
"mdx-vue": "^1.0.2",
8583
"mdx-vue-loader": "^1.0.2",
86-
"mixpanel-browser": "^2.36.0",
8784
"node-fetch": "^2.6.0",
8885
"node-sass": "^4.13.1",
8986
"nuxt": "^2.13.3",
@@ -118,6 +115,7 @@
118115
"@emotion/eslint-plugin": "^11.0.0",
119116
"@nuxtjs/eslint-config": "^3.0.0",
120117
"@nuxtjs/eslint-module": "^1.0.0",
118+
"@nuxtjs/google-analytics": "^2.4.0",
121119
"@nuxtjs/module-test-utils": "^1.6.1",
122120
"@testing-library/jest-dom": "^5.1.1",
123121
"@testing-library/user-event": "^10.0.0",

‎packages/chakra-ui-core/CHANGELOG.md‎

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

3+
## 0.7.1
4+
5+
### Patch Changes
6+
7+
- Improve publishing workflow
8+
39
## 0.7.0
410

511
### Minor Changes

‎packages/chakra-ui-core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@chakra-ui/vue",
3-
"version": "0.7.0",
3+
"version": "0.7.1",
44
"description": "Build Accessible and Responsive Vue.js websites and applications with speed ⚡️",
55
"main": "dist/cjs/index.js",
66
"module": "dist/esm/index.js",

‎packages/chakra-ui-core/src/utils/icons.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ const parseIcons = (iconSet) => {
2323
}
2424
}
2525
} else {
26-
console.log(iconObject)
2726
return {}
2827
}
2928
}

‎packages/chakra-ui-nuxt/CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Change Log
22

3+
## 0.2.1
4+
5+
### Patch Changes
6+
7+
- Improve publishing workflow
8+
- Updated dependencies [undefined]
9+
- @chakra-ui/vue@0.7.1
10+
311
## 0.2.0
412

513
### Minor Changes

‎packages/chakra-ui-nuxt/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@chakra-ui/nuxt",
3-
"version": "0.2.0",
3+
"version": "0.2.1",
44
"description": "Chakra UI Module for Nuxt.js",
55
"repository": "https://github.com/chakra-ui/chakra-ui-vue",
66
"license": "MIT",
@@ -18,7 +18,7 @@
1818
"test": "jest"
1919
},
2020
"dependencies": {
21-
"@chakra-ui/vue": "^0.7.0",
21+
"@chakra-ui/vue": "^0.7.1",
2222
"chakra-loader": "latest",
2323
"@emotion/css": "^11.0.0"
2424
},

‎website/nuxt.config.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ export default {
2727
},
2828
loading: { color: '#fff' },
2929
plugins: [
30-
{ src: 'plugins/analytics.js', ssr: false },
3130
'plugins/links.js',
3231
'plugins/editor.js',
3332
'plugins/chakra-ui.js',
@@ -39,7 +38,8 @@ export default {
3938
],
4039
buildModules: [
4140
'@nuxtjs/eslint-module',
42-
'modules/routes'
41+
'modules/routes',
42+
'@nuxtjs/google-analytics'
4343
],
4444
modules: [
4545
'@nuxtjs/emotion',
@@ -87,5 +87,8 @@ export default {
8787
extend (config, ctx) {
8888
config.resolve.alias.vue = 'vue/dist/vue.common'
8989
}
90+
},
91+
googleAnalytics: {
92+
id: 'UA-185956694-2'
9093
}
9194
}

‎website/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"@nuxtjs/dotenv": "^1.4.0",
3434
"@nuxtjs/emotion": "^0.0.1",
3535
"@nuxtjs/now-builder": "^0.17.0",
36+
"@nuxtjs/google-analytics": "^2.4.0",
3637
"@nuxtjs/pwa": "^3.0.0-0",
3738
"@vue-a11y/skip-to": "^2.0.1",
3839
"copy-to-clipboard": "^3.3.1",
@@ -43,7 +44,6 @@
4344
"github-buttons": "^2.11.3",
4445
"mdx-vue": "^1.0.2",
4546
"mdx-vue-loader": "^1.0.2",
46-
"mixpanel-browser": "^2.36.0",
4747
"node-sass": "^4.13.1",
4848
"nuxt": "^2.13.3",
4949
"prismjs": "^1.19.0",

0 commit comments

Comments
 (0)