Merge branch 'dev'

Author: levy

.grenrc.js

@@ -0,0 +1,32 @@
+module.exports = {
+  dataSource: 'prs',
+  prefix: '',
+  ignoreLabels: ['duplicate', 'help wanted', 'invalid', 'question', 'wontfix'],
+  ignoreIssuesWith: [
+    'duplicate',
+    'help wanted',
+    'invalid',
+    'question',
+    'wontfix'
+  ],
+  onlyMilestones: false,
+  changelogFilename: 'CHANGELOG.md',
+  template: {
+    issue: '- {{name}} [{{text}}]({{url}})',
+    group: '\n### {{heading}}\n'
+  },
+  // https://github.com/nuxt/nuxt.js/releases
+  // https://gitmoji.carloscuesta.me
+  groupBy: {
+    '✨ New Features:': ['enhancement'],
+    '🐛 Bug Fixes:': ['bug'],
+    '📖 Documentation:': ['documentation'],
+    '💅 Refactors:': ['refactor'],
+    '♻️ Tests:': ['test'],
+    '🚀 Performance:': ['performance'],
+    '⚓ Dependency upgrades:': ['dependencies'],
+    '🏡 Chore:': ['chore'],
+    '💄 Style:': ['style'],
+    '🎩 Hack': ['hack']
+  }
+}

README.md

@@ -34,6 +34,7 @@ Create a Deepexi Nuxt App in seconds.
 - [x] [dotenv](https://github.com/motdotla/dotenv) Loads environment variables from .env for nodejs projects
 - [x] [element-ui](https://element.eleme.io/) A Vue.js 2.0 UI Toolkit for Web
 - [x] [vant](https://youzan.github.io/vant) Lightweight Mobile UI Components built on Vue
+- [x] [PWA](https://pwa.nuxtjs.org) Nuxt Progressive Web Apps solution
 
 [⬆ Back to Top](#table-of-contents)
 

notify.sh

@@ -5,6 +5,8 @@ then
   exit 1
 fi
 
+GREN_GITHUB_TOKEN=$GITHUB_TOKEN yarn release
+
 url=https://api.github.com/repos/$TRAVIS_REPO_SLUG/releases/latest
 resp_tmp_file=resp.tmp
 

package.json

@@ -20,7 +20,8 @@
     "test": "ava test --verbose",
     "test:snapshot": "ava test --verbose --update-snapshots",
     "build": "node bin/cli.js -a -o release",
-    "build:release": "node bin/cli.js -a -o release && node bin/zip.js"
+    "build:release": "node bin/cli.js -a -o release && node bin/zip.js",
+    "release": "gren release --override"
   },
   "dependencies": {
     "cac": "^6.5.2",
@@ -42,6 +43,7 @@
     "eslint-plugin-promise": "^4.0.1",
     "eslint-plugin-standard": "^4.0.0",
     "eslint-plugin-vue": "^5.1.0",
+    "github-release-notes": "^0.17.0",
     "husky": "1.3.1",
     "semantic-release": "^15.13.24"
   },
@@ -80,7 +82,6 @@
           ]
         }
       ],
-      "@semantic-release/release-notes-generator",
       "@semantic-release/npm",
       [
         "@semantic-release/github",

template.config.js

@@ -26,7 +26,8 @@ const common = {
   release: 'release-log',
   styles: 'styles',
   'icon-font': 'icon-font',
-  test: 'jest'
+  test: 'jest',
+  utils: 'utils'
 }
 
 const desktop = {

template/_package.json

@@ -31,7 +31,7 @@
     "start": "cross-env HOST=0.0.0.0 PORT=3333 MODE=prod nuxt start",
     "stdver": "standard-version -m '[skip ci] chore(release): v%s'",
     "release": "gren release --override",
-    "lint": "eslint src/**/*.{js,vue} --fix && stylelint src/**/*.{vue,less} --fix"
+    "lint": "eslint 'src/**/*.@(js|vue)' --fix && stylelint src/**/*.{vue,less} --fix"
   },
   "dependencies": {
     <%_ if (template === 'mobile') { _%>
@@ -45,6 +45,7 @@
     <%_ } _%>
     "@nuxtjs/axios": "^5.0.1",
     "@nuxtjs/dotenv": "^1.3.0",
+    "@nuxtjs/pwa": "^3.0.0-beta.16",
     "dayjs": "^1.7.4",
     "dotenv": "^6.0.0",
     "js-cookie": "^2.2.0",
@@ -95,8 +96,12 @@
     }
   },
   "lint-staged": {
-    "*.{js,vue,less}": [
-      "yarn lint",
+    "*.{js,vue}": [
+      "eslint --fix",
+      "git add"
+    ],
+    "*.{vue,less}": [
+      "stylelint --fix",
       "git add"
     ],
     "*.{md,json}": [

template/commitlint.config.js

@@ -1,6 +1,6 @@
 module.exports = {
   extends: ['@commitlint/config-conventional'],
   rules: {
-    'type-enum': [0, 'always', ['merge']]
-  }
+    'type-enum': [0, 'always', ['merge']],
+  },
 }

template/frameworks/axios/plugins/axios.js

@@ -18,9 +18,14 @@
 
 import Vue from 'vue'
 
+const skipUrls = ['easy-mock']
+
 export default function({$axios, store, app, redirect}) {
   $axios.onRequest(config => {
     let url = config.url
+
+    if (skipUrls.some(skipUrl => url.indexOf(skipUrl) > -1)) return
+
     // jwt 验证
     if (store.state.token) {
       config.headers.common['Authorization'] = `Bearer ${store.state.token}`

template/frameworks/element-ui/plugins/element.js

@@ -32,7 +32,7 @@ import {
   DropdownMenu,
   DropdownItem,
   Row,
-  Col
+  Col,
 } from 'element-ui'
 import ElFormRenderer from '@femessage/el-form-renderer'
 import ElDataTable from '@femessage/el-data-table'

template/frameworks/filters/plugins/filters.js

@@ -13,7 +13,7 @@ export function price(val, cancelFixed) {
   return parseFloat(val).toLocaleString('zh-Hans-CN', {
     style: 'currency',
     currency: 'CNY',
-    minimumFractionDigits: cancelFixed ? 0 : 2
+    minimumFractionDigits: cancelFixed ? 0 : 2,
   })
 }