Merge branch 'dev'

Author: levy

.all-contributorsrc

@@ -79,7 +79,17 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "zhn4",
+      "name": "zhn4",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/11404946?v=4",
+      "profile": "https://github.com/zhn4",
+      "contributions": [
+        "code"
+      ]
     }
   ],
-  "contributorsPerLine": 7
+  "contributorsPerLine": 7,
+  "skipCi": true
 }

.travis.yml

@@ -1,6 +1,7 @@
 branches:
   only:
     - master
+    - dev
 language: node_js
 node_js:
 - lts/*
@@ -10,23 +11,29 @@ install:
 - yarn --frozen-lockfile
 script:
   - yarn test
-  - yarn build:release
-  - yarn deploy
+  - yarn generate
+  # https://stackoverflow.com/questions/37544306/travis-different-script-for-different-branch
+  - test "$TRAVIS_BRANCH" = "dev" && yarn build && ./lhci.sh || echo skip
+  - test "$TRAVIS_BRANCH" = "master" &&  yarn zip || echo skip
+addons:
+  chrome: stable
 cache: 
   - yarn
   - directories:
     - release/nuxt-element-dashboard/node_modules
     - release/nuxt-multiple-spa/node_modules
     - release/nuxt-vant/node_modules
 deploy:
-  - provider: pages
-    skip_cleanup: true
-    github_token: $GITHUB_TOKEN  # Set in the settings page of your repository, as a secure variable
-    local-dir: dist
-    on:
-      branch: master
+  #- provider: pages
+  #  skip_cleanup: true
+  #  github_token: $GITHUB_TOKEN  # Set in the settings page of your repository, as a secure variable
+  #  local-dir: dist
+  #  on:
+  #    branch: master
   - provider: script
     skip_cleanup: true
     script: npx semantic-release
+    on:
+      branch: master
 after_script:
   - ./notify.sh

README.md

@@ -129,19 +129,25 @@ Please check out [developer guide](./developer-guide.md).
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-<!-- prettier-ignore -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
 <table>
   <tr>
-    <td align="center"><a href="https://github.com/lianghx-319"><img src="https://avatars2.githubusercontent.com/u/27187946?v=4" width="100px;" alt="Han"/><br /><sub><b>Han</b></sub></a><br /><a href="https://github.com/FEMessage/create-nuxt-app/commits?author=lianghx-319" title="Code">💻</a> <a href="https://github.com/FEMessage/create-nuxt-app/commits?author=lianghx-319" title="Documentation">📖</a> <a href="https://github.com/FEMessage/create-nuxt-app/commits?author=lianghx-319" title="Tests">⚠️</a> <a href="#infra-lianghx-319" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
-    <td align="center"><a href="https://donaldshen.github.io/portfolio"><img src="https://avatars3.githubusercontent.com/u/19591950?v=4" width="100px;" alt="Donald Shen"/><br /><sub><b>Donald Shen</b></sub></a><br /><a href="https://github.com/FEMessage/create-nuxt-app/commits?author=donaldshen" title="Code">💻</a> <a href="https://github.com/FEMessage/create-nuxt-app/commits?author=donaldshen" title="Tests">⚠️</a> <a href="#maintenance-donaldshen" title="Maintenance">🚧</a></td>
-    <td align="center"><a href="https://github.com/levy9527/blog"><img src="https://avatars3.githubusercontent.com/u/9384365?v=4" width="100px;" alt="levy"/><br /><sub><b>levy</b></sub></a><br /><a href="#review-levy9527" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="http://67.216.223.155/resume/"><img src="https://avatars3.githubusercontent.com/u/26338853?v=4" width="100px;" alt="OuZuYu"/><br /><sub><b>OuZuYu</b></sub></a><br /><a href="https://github.com/FEMessage/create-nuxt-app/commits?author=OuZuYu" title="Code">💻</a></td>
-    <td align="center"><a href="https://evila.me"><img src="https://avatars3.githubusercontent.com/u/19513289?v=4" width="100px;" alt="EVILLT"/><br /><sub><b>EVILLT</b></sub></a><br /><a href="https://github.com/FEMessage/create-nuxt-app/commits?author=evillt" title="Code">💻</a> <a href="https://github.com/FEMessage/create-nuxt-app/commits?author=evillt" title="Documentation">📖</a> <a href="#tool-evillt" title="Tools">🔧</a></td>
-    <td align="center"><a href="https://colmugx.github.io"><img src="https://avatars1.githubusercontent.com/u/21327913?v=4" width="100px;" alt="ColMugX"/><br /><sub><b>ColMugX</b></sub></a><br /><a href="https://github.com/FEMessage/create-nuxt-app/commits?author=colmugx" title="Code">💻</a></td>
-    <td align="center"><a href="https://shoyuf.top"><img src="https://avatars3.githubusercontent.com/u/27998490?v=4" width="100px;" alt="Shoyuf"/><br /><sub><b>Shoyuf</b></sub></a><br /><a href="https://github.com/FEMessage/create-nuxt-app/commits?author=shoyuf" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/lianghx-319"><img src="https://avatars2.githubusercontent.com/u/27187946?v=4" width="100px;" alt=""/><br /><sub><b>Han</b></sub></a><br /><a href="https://github.com/FEMessage/create-nuxt-app/commits?author=lianghx-319" title="Code">💻</a> <a href="https://github.com/FEMessage/create-nuxt-app/commits?author=lianghx-319" title="Documentation">📖</a> <a href="https://github.com/FEMessage/create-nuxt-app/commits?author=lianghx-319" title="Tests">⚠️</a> <a href="#infra-lianghx-319" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://donaldshen.github.io/portfolio"><img src="https://avatars3.githubusercontent.com/u/19591950?v=4" width="100px;" alt=""/><br /><sub><b>Donald Shen</b></sub></a><br /><a href="https://github.com/FEMessage/create-nuxt-app/commits?author=donaldshen" title="Code">💻</a> <a href="https://github.com/FEMessage/create-nuxt-app/commits?author=donaldshen" title="Tests">⚠️</a> <a href="#maintenance-donaldshen" title="Maintenance">🚧</a></td>
+    <td align="center"><a href="https://github.com/levy9527/blog"><img src="https://avatars3.githubusercontent.com/u/9384365?v=4" width="100px;" alt=""/><br /><sub><b>levy</b></sub></a><br /><a href="https://github.com/FEMessage/create-nuxt-app/pulls?q=is%3Apr+reviewed-by%3Alevy9527" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="http://67.216.223.155/resume/"><img src="https://avatars3.githubusercontent.com/u/26338853?v=4" width="100px;" alt=""/><br /><sub><b>OuZuYu</b></sub></a><br /><a href="https://github.com/FEMessage/create-nuxt-app/commits?author=OuZuYu" title="Code">💻</a></td>
+    <td align="center"><a href="https://evila.me"><img src="https://avatars3.githubusercontent.com/u/19513289?v=4" width="100px;" alt=""/><br /><sub><b>EVILLT</b></sub></a><br /><a href="https://github.com/FEMessage/create-nuxt-app/commits?author=evillt" title="Code">💻</a> <a href="https://github.com/FEMessage/create-nuxt-app/commits?author=evillt" title="Documentation">📖</a> <a href="#tool-evillt" title="Tools">🔧</a></td>
+    <td align="center"><a href="https://colmugx.github.io"><img src="https://avatars1.githubusercontent.com/u/21327913?v=4" width="100px;" alt=""/><br /><sub><b>ColMugX</b></sub></a><br /><a href="https://github.com/FEMessage/create-nuxt-app/commits?author=colmugx" title="Code">💻</a></td>
+    <td align="center"><a href="https://shoyuf.top"><img src="https://avatars3.githubusercontent.com/u/27998490?v=4" width="100px;" alt=""/><br /><sub><b>Shoyuf</b></sub></a><br /><a href="https://github.com/FEMessage/create-nuxt-app/commits?author=shoyuf" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/zhn4"><img src="https://avatars2.githubusercontent.com/u/11404946?v=4" width="100px;" alt=""/><br /><sub><b>zhn4</b></sub></a><br /><a href="https://github.com/FEMessage/create-nuxt-app/commits?author=zhn4" title="Code">💻</a></td>
   </tr>
 </table>
 
+<!-- markdownlint-enable -->
+<!-- prettier-ignore-end -->
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

lhci.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+yarn global add @lhci/cli
+
+lhci autorun --upload.target=temporary-public-storage --collect.staticDistDir=./dist --collect.url=http://localhost/nuxt-element-dashboard --collect.url=http://localhost/nuxt-multiple-spa --collect.url=http://localhost/nuxt-vant

notify.sh

@@ -1,4 +1,10 @@
 #!/bin/sh
+if [ "$TRAVIS_BRANCH" != "master" ]
+then
+  echo "do not notify cause not on master branch"
+  exit 0
+fi
+
 if [ "$TRAVIS_TEST_RESULT" != "0" ]
 then
   echo "build not success, bye"

package.json

@@ -22,9 +22,9 @@
     "lint": "eslint ./",
     "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",
-    "deploy": "yarn build && node bin/deploy/build.js",
+    "generate": "node bin/cli.js -a -o release",
+    "zip": "node bin/zip.js",
+    "build": "node bin/deploy/build.js",
     "release": "gren release --override"
   },
   "dependencies": {

template/framework-mobile/_package.json

@@ -32,6 +32,7 @@
     "@femessage/data-list": "latest",
     "@femessage/upload-to-ali": "latest",
     "@femessage/vant": "latest",
+    "@femessage/v-img": "latest",
     "@nuxtjs/axios": "^5.0.1",
     "@nuxtjs/dotenv": "^1.3.0",
     "@nuxtjs/google-analytics": "^2.2.2",

template/framework-mobile/pages/goods-detail.vue

@@ -2,7 +2,7 @@
   <div class="goods-detail">
     <van-swipe :autoplay="3000" class="swipe">
       <van-swipe-item v-for="thumb in goods.thumb" :key="thumb">
-        <img :src="thumb" />
+        <v-img :src="thumb" />
       </van-swipe-item>
     </van-swipe>
 

template/framework-mobile/pages/index.vue

@@ -2,15 +2,15 @@
   <div class="index">
     <van-swipe :autoplay="3000" indicator-color="white">
       <van-swipe-item v-for="(image, index) in images" :key="index">
-        <img :src="image" class="banner" />
+        <v-img :src="image" class="banner" width="100" />
       </van-swipe-item>
     </van-swipe>
     <van-row class="goods">
       <van-cell title="热销商品" icon="fire-o" />
       <van-row>
         <van-col v-for="(good, index) in goods" :key="index" span="12">
           <div class="block" @click="goDetail(good)">
-            <img :src="good.img" class="good-img" />
+            <v-img :src="good.img" class="good-img" width="100" />
             <p class="name">{{ good.name }}</p>
             <p class="price">{{ good.price | price }}</p>
           </div>

template/framework-mobile/pages/my.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="my">
-    <img
+    <v-img
       class="my-poster"
       src="https://img.yzcdn.cn/public_files/2017/10/23/8690bb321356070e0b8c4404d087f8fd.png"
     />