Merge pull request #365 from chakra-ui/develop

codebender828 · web-flow · commit c970707f1e93 · 2020-12-24T19:47:50.000+08:00
chore: bump version
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,57 +5,58 @@ name: Build & Test Components
 
 on:
   push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+    branches:
+      - master
+    paths:
+      - "packages/**"
 
 jobs:
-  build:
+  release:
+    name: Release
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: 12.x
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout Repo
+      uses: actions/checkout@master
+      with:
+        # This makes Actions fetch all Git history
+        # so that Changesets can generate changelogs with the correct commits
+        fetch-depth: 0
+
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@master
       with:
         node-version: ${{ matrix.node-version }}
-    - run: yarn
-    - run: yarn bootstrap
-    - run: yarn lint
-    - run: yarn build --if-present
-    - run: yarn test
+
+    - name: Install dependencies
+      run: yarn
+
+    - name: Bootstrap
+      run: yarn bootstrap
+
+    - name: Linting
+      run: yarn lint
+
+    - name: Testing components
+      run: yarn test
       env:
         CI: true
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v1
-      - name: Setup Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12
-      - name: Install Dependencies
-        run: yarn
-      - name: Create Release Pull Request
-        uses: changesets/action@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  publish-npm:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12
-          registry-url: https://registry.npmjs.org/
-      - run: yarn
-      - run: yarn build
-      - run: yarn publish-ci
-        env:
-          NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
+    - name: Building packages
+      run: yarn build --if-present
+
+    - name: Setup CI Git User
+      run: |
+        git config --global user.email "jbakebwa@gmail.com"
+        git config --global user.name "codebender828"
+    
+    - name: Publish packages
+      uses: changesets/action@master
+      with:
+        publish: yarn release
+        commit: "chore(release): version packages"
+      env:
+        NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}    
diff --git a/.gitignore b/.gitignore
@@ -35,4 +35,5 @@ lerna-debug.log
 .now
 config/.env
 packages/chakra-ui-nuxt/.github
-packages/chakra-ui-docs/static/sw.js
+packages/chakra-ui-docs/static/sw.js
+website/static/sw.js
diff --git a/package.json b/package.json
@@ -30,9 +30,7 @@
     "test:core": "jest",
     "test:module": "yarn workspace @chakra-ui/nuxt test",
     "test": "yarn test:core && yarn test:module",
-    "publish-ci": "lerna publish from-package -y --no-verify-access",
-    "release": "lerna version patch && lerna publish from-package",
-    "push": "git add -A && git commit -m \"chore(lerna): publishing package \" && lerna version --conventional-commits",
+    "release": "changeset publish",
     "clean": "lerna run clean",
     "storybook": "cross-env STORYBOOK_VUE_DEV_TOOLS=1 start-storybook -p 9000",
     "storybook:devtools": "vue-devtools",
@@ -83,7 +81,6 @@
     "lint-staged": "^9.4.2",
     "mdx-vue": "^1.0.2",
     "mdx-vue-loader": "^1.0.2",
-    "mixpanel-browser": "^2.36.0",
     "node-fetch": "^2.6.0",
     "node-sass": "^4.13.1",
     "nuxt": "^2.13.3",
@@ -118,6 +115,7 @@
     "@emotion/eslint-plugin": "^11.0.0",
     "@nuxtjs/eslint-config": "^3.0.0",
     "@nuxtjs/eslint-module": "^1.0.0",
+    "@nuxtjs/google-analytics": "^2.4.0",
     "@nuxtjs/module-test-utils": "^1.6.1",
     "@testing-library/jest-dom": "^5.1.1",
     "@testing-library/user-event": "^10.0.0",
diff --git a/packages/chakra-ui-core/CHANGELOG.md b/packages/chakra-ui-core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.7.1
+
+### Patch Changes
+
+- Improve publishing workflow
+
 ## 0.7.0
 
 ### Minor Changes
diff --git a/packages/chakra-ui-core/package.json b/packages/chakra-ui-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chakra-ui/vue",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Build Accessible and Responsive Vue.js websites and applications with speed ⚡️",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
diff --git a/packages/chakra-ui-core/src/utils/icons.js b/packages/chakra-ui-core/src/utils/icons.js
@@ -23,7 +23,6 @@ const parseIcons = (iconSet) => {
         }
       }
     } else {
-      console.log(iconObject)
       return {}
     }
   }
diff --git a/packages/chakra-ui-nuxt/CHANGELOG.md b/packages/chakra-ui-nuxt/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## 0.2.1
+
+### Patch Changes
+
+- Improve publishing workflow
+- Updated dependencies [undefined]
+  - @chakra-ui/vue@0.7.1
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/packages/chakra-ui-nuxt/package.json b/packages/chakra-ui-nuxt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chakra-ui/nuxt",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Chakra UI Module for Nuxt.js",
   "repository": "https://github.com/chakra-ui/chakra-ui-vue",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@chakra-ui/vue": "^0.7.0",
+    "@chakra-ui/vue": "^0.7.1",
     "chakra-loader": "latest",
     "@emotion/css": "^11.0.0"
   },
diff --git a/website/nuxt.config.js b/website/nuxt.config.js
@@ -27,7 +27,6 @@ export default {
   },
   loading: { color: '#fff' },
   plugins: [
-    { src: 'plugins/analytics.js', ssr: false },
     'plugins/links.js',
     'plugins/editor.js',
     'plugins/chakra-ui.js',
@@ -39,7 +38,8 @@ export default {
   ],
   buildModules: [
     '@nuxtjs/eslint-module',
-    'modules/routes'
+    'modules/routes',
+    '@nuxtjs/google-analytics'
   ],
   modules: [
     '@nuxtjs/emotion',
@@ -87,5 +87,8 @@ export default {
     extend (config, ctx) {
       config.resolve.alias.vue = 'vue/dist/vue.common'
     }
+  },
+  googleAnalytics: {
+    id: 'UA-185956694-2'
   }
 }
diff --git a/website/package.json b/website/package.json
@@ -33,6 +33,7 @@
     "@nuxtjs/dotenv": "^1.4.0",
     "@nuxtjs/emotion": "^0.0.1",
     "@nuxtjs/now-builder": "^0.17.0",
+    "@nuxtjs/google-analytics": "^2.4.0",
     "@nuxtjs/pwa": "^3.0.0-0",
     "@vue-a11y/skip-to": "^2.0.1",
     "copy-to-clipboard": "^3.3.1",
@@ -43,7 +44,6 @@
     "github-buttons": "^2.11.3",
     "mdx-vue": "^1.0.2",
     "mdx-vue-loader": "^1.0.2",
-    "mixpanel-browser": "^2.36.0",
     "node-sass": "^4.13.1",
     "nuxt": "^2.13.3",
     "prismjs": "^1.19.0",
diff --git a/website/pages/index.vue b/website/pages/index.vue
@@ -121,10 +121,6 @@ export default {
       { charset: 'utf-8' },
       { name: 'viewport', content: 'width=device-width, initial-scale=1' }]
     }
-  },
-  beforeMount () {
-    console.log(this.$mixpanel)
-    this.$mixpanel.track('Page view', { page: '/' })
   }
 }
 </script>
diff --git a/website/plugins/analytics.js b/website/plugins/analytics.js
diff --git a/website/static/sw.js b/website/static/sw.js
@@ -1,32 +1 @@
-importScripts('https://cdn.jsdelivr.net/npm/workbox-cdn@4.3.1/workbox/workbox-sw.js')
-
-// --------------------------------------------------
-// Configure
-// --------------------------------------------------
-
-// Set workbox config
-workbox.setConfig({
-  "debug": false
-})
-
-// Start controlling any existing clients as soon as it activates
-workbox.core.clientsClaim()
-
-// Skip over the SW waiting lifecycle stage
-workbox.core.skipWaiting()
-
-workbox.precaching.cleanupOutdatedCaches()
-
-// --------------------------------------------------
-// Precaches
-// --------------------------------------------------
-
-// Precache assets
-
-// --------------------------------------------------
-// Runtime Caching
-// --------------------------------------------------
-
-// Register route handlers for runtimeCaching
-workbox.routing.registerRoute(new RegExp('/_nuxt/'), new workbox.strategies.CacheFirst ({}), 'GET')
-workbox.routing.registerRoute(new RegExp('/'), new workbox.strategies.NetworkFirst ({}), 'GET')
+// THIS FILE SHOULD NOT BE VERSION CONTROLLED
diff --git a/website/utils/index.js b/website/utils/index.js
@@ -21,7 +21,6 @@ export const removeHyphenFromString = (hyphenatedString) => {
 }
 
 export const findNextAndPrevRoute = (path) => {
-  console.log(path)
   const orderedRoutes = [...topNavLinks, ...aboutNavLinks, ...components]
 
   let isValidRoutePath = false
@@ -33,8 +32,6 @@ export const findNextAndPrevRoute = (path) => {
     }
     extractedRoutes.push({ name: singleRoute, path: urlString })
   })
-
-  console.log(isValidRoutePath)
   if (isValidRoutePath === false) {
     return { prev: '', next: '' }
   }
diff --git a/yarn.lock b/yarn.lock
@@ -1709,24 +1709,6 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@chakra-ui/vue@latest":
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/@chakra-ui/vue/-/vue-0.6.6.tgz#1c34797a509e396aa75a6e2b875eff81a4e5f6f8"
-  integrity sha512-Ss7+Ht0KW0RBfh4R2IjGPZ64Pjvc+oQFjezLhV0UTskiNHRHzgLKwKy6A8UzN7mcydGkjXpRvT6GGZvoGQe9ZQ==
-  dependencies:
-    "@popperjs/core" "^2.4.0"
-    "@styled-system/css" "^5.0.23"
-    animejs "^3.1.0"
-    aria-hidden "^1.1.1"
-    breadstick "^0.2.14"
-    color "^3.1.2"
-    focus-trap "^5.1.0"
-    focus-trap-vue "^0.0.4"
-    lodash-es "^4.17.15"
-    portal-vue "^2.1.6"
-    styled-system "^5.1.2"
-    v-scroll-lock "^1.1.0"
-
 "@changesets/apply-release-plan@^3.0.1":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@changesets/apply-release-plan/-/apply-release-plan-3.0.2.tgz#e8f77518f065181717cc998d60b9dcaeb7387870"
@@ -3916,6 +3898,13 @@
     consola "^2.10.1"
     eslint-loader "^3.0.0"
 
+"@nuxtjs/google-analytics@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/google-analytics/-/google-analytics-2.4.0.tgz#3bb9f398a05cc23340d1f423f8d8653dc4114f46"
+  integrity sha512-rDQTwHIjyjVrx8GywHPuWykJ3jRFGaHl5Iqji/y8tQWUc0yGEeHxOoR0yimzxnTS1Ph2/PubQYpgnVeEPEdL/A==
+  dependencies:
+    vue-analytics "^5.22.1"
+
 "@nuxtjs/module-test-utils@^1.6.1":
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/@nuxtjs/module-test-utils/-/module-test-utils-1.6.1.tgz#14c80e4cc18fa87a12115a5e100daec17169a1b7"
@@ -17163,11 +17152,6 @@ mixme@^0.3.1:
   resolved "https://registry.yarnpkg.com/mixme/-/mixme-0.3.5.tgz#304652cdaf24a3df0487205e61ac6162c6906ddd"
   integrity sha512-SyV9uPETRig5ZmYev0ANfiGeB+g6N2EnqqEfBbCGmmJ6MgZ3E4qv5aPbnHVdZ60KAHHXV+T3sXopdrnIXQdmjQ==
 
-mixpanel-browser@^2.36.0:
-  version "2.36.0"
-  resolved "https://registry.yarnpkg.com/mixpanel-browser/-/mixpanel-browser-2.36.0.tgz#2a7c042309c9eeac520c6bc87295fcd05e74599b"
-  integrity sha512-5MJvMYsfkRKGtNsCnJeODYWqhtyT3BSK2XoO0Oy9+fLSEvPLTBbNDSlP6xCBeWeBb2CmCmqWnweheVTT1ls78g==
-
 mkdirp-classic@^0.5.2:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
@@ -23752,6 +23736,11 @@ void-elements@^2.0.1:
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
   integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
+vue-analytics@^5.22.1:
+  version "5.22.1"
+  resolved "https://registry.yarnpkg.com/vue-analytics/-/vue-analytics-5.22.1.tgz#9d6b32da56daee1b9dfb23a267b50349a03f710f"
+  integrity sha512-HPKQMN7gfcUqS5SxoO0VxqLRRSPkG1H1FqglsHccz6BatBatNtm/Vyy8brApktZxNCfnAkrSVDpxg3/FNDeOgQ==
+
 vue-client-only@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/vue-client-only/-/vue-client-only-2.0.0.tgz#ddad8d675ee02c761a14229f0e440e219de1da1c"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@chakra-ui/vue",`
`3`		`- "version": "0.7.0",`
	`3`	`+ "version": "0.7.1",`
`4`	`4`	`"description": "Build Accessible and Responsive Vue.js websites and applications with speed ⚡️",`
`5`	`5`	`"main": "dist/cjs/index.js",`
`6`	`6`	`"module": "dist/esm/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ const parseIcons = (iconSet) => {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`} else {`
`26`		`- console.log(iconObject)`
`27`	`26`	`return {}`
`28`	`27`	`}`
`29`	`28`	`}`