Merge branch 'dev'

Author: levy

.travis.yml

@@ -5,7 +5,7 @@ language: node_js
 node_js:
 - lts/*
 git:
-  depth: 3
+  depth: 15
 install:
 - yarn --frozen-lockfile
 script:

bin/deploy/build.js

@@ -64,7 +64,7 @@ class BuildProcess {
     this.options = {
       cwd: path.join(releaseDir, templateName),
       env: {
-        API_SERVER: 'https://easy-mock.com/mock/5c1b3895fe5907404e654045/femessage-mock',
+        API_SERVER: 'https://mockapi.eolinker.com/IeZWjzy87c204a1f7030b2a17b00f3776ce0a07a5030a1b',
         ...process.env,
         ...env,
         PUBLIC_PATH: `${process.env.PUBLIC_PATH || ''}/${this.folderName}`

template/framework-mobile/_package.json

@@ -34,6 +34,7 @@
     "@femessage/vant": "latest",
     "@nuxtjs/axios": "^5.0.1",
     "@nuxtjs/dotenv": "^1.3.0",
+    "@nuxtjs/google-analytics": "^2.2.2",
     "@nuxtjs/pwa": "^3.0.0-beta.16",
     "@nuxtjs/style-resources": "^0.1.2",
     "dayjs": "^1.7.4",

template/framework-mobile/postcss.config.js

@@ -8,7 +8,11 @@ module.exports = ({file}) => {
    * 使vant组件代码自适应viewport。引入其他第三方样式库时可参考此方式处理
    * @see https://github.com/youzan/vant/issues/1181
    */
-  if (file && file.dirname && file.dirname.indexOf('vant') > -1) {
+  if (
+    file &&
+    file.dirname &&
+    /node_modules\/@femessage\/vant/.test(file.dirname)
+  ) {
     vwUnit = 375
   }
   return {

template/framework-mobile/yarn.lock

@@ -36,6 +36,7 @@
     "@femessage/upload-to-ali": "latest",
     "@nuxtjs/axios": "^5.0.1",
     "@nuxtjs/dotenv": "^1.3.0",
+    "@nuxtjs/google-analytics": "^2.2.2",
     "@nuxtjs/pwa": "^3.0.0-beta.16",
     "@nuxtjs/style-resources": "^0.1.2",
     "dayjs": "^1.7.4",
@@ -52,7 +53,6 @@
     "@commitlint/config-conventional": "^8.0.0",
     "babel-eslint": "^8.2.1",
     "babel-jest": "^24.1.0",
-    "babel-plugin-component": "^1.1.0",
     "cross-env": "^5.1.3",
     "eslint": "^4.15.0",
     "eslint-config-prettier": "^6.1.0",

template/framework-multiple/_package.json

@@ -36,6 +36,7 @@
     "@femessage/upload-to-ali": "latest",
     "@nuxtjs/axios": "^5.0.1",
     "@nuxtjs/dotenv": "^1.3.0",
+    "@nuxtjs/google-analytics": "^2.2.2",
     "@nuxtjs/pwa": "^3.0.0-beta.16",
     "@nuxtjs/style-resources": "^0.1.2",
     "dayjs": "^1.7.4",
@@ -52,7 +53,6 @@
     "@commitlint/config-conventional": "^8.0.0",
     "babel-eslint": "^8.2.1",
     "babel-jest": "^24.1.0",
-    "babel-plugin-component": "^1.1.0",
     "cross-env": "^5.1.3",
     "eslint": "^4.15.0",
     "eslint-config-prettier": "^6.1.0",