Merge branch 'develop'

Former-commit-id: 9fca2e95834dee3455d4fc975e7bc40a58bc0192

babel.config.js

@@ -1,5 +1,9 @@
 module.exports = {
   presets: [
     '@vue/app'
+  ],
+  plugins: [
+    // https://babeljs.io/docs/en/babel-plugin-transform-runtime/
+    '@babel/plugin-transform-runtime'
   ]
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.6.13",
+  "version": "1.6.14",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",
@@ -13,9 +13,9 @@
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
+    "@babel/runtime": "^7.2.0",
     "@d2-projects/vue-filters-date": "^1.0.2",
     "axios": "^0.17.1",
-    "babel-polyfill": "^6.26.0",
     "better-scroll": "^1.12.1",
     "dayjs": "^1.6.7",
     "element-ui": "^2.4.4",
@@ -36,6 +36,7 @@
     "vuex": "^3.0.1"
   },
   "devDependencies": {
+    "@babel/plugin-transform-runtime": "^7.2.0",
     "@kazupon/vue-i18n-loader": "^0.3.0",
     "@vue/cli-plugin-babel": "^3.0.0",
     "@vue/cli-plugin-eslint": "^3.0.0",

src/components/d2-container/components/d2-source.vue

@@ -24,9 +24,7 @@ export default {
   },
   computed: {
     show () {
-      return process.env.VUE_APP_BUILD_MODE === 'TRAVIS' ||
-        process.env.NODE_ENV === 'development' &&
-        this.filename
+      return (process.env.VUE_APP_BUILD_MODE === 'TRAVIS' || process.env.NODE_ENV === 'development') && this.filename
     }
   },
   mounted () {

src/main.js

@@ -1,5 +1,3 @@
-// polyfill
-import 'babel-polyfill'
 // Vue
 import Vue from 'vue'
 import App from './App'

vue.config.js

@@ -98,18 +98,13 @@ module.exports = {
       .end()
     // 重新设置 alias
     config.resolve.alias
-      .set('@', resolve('src'))
       .set('@api', resolve('src/api'))
     // node
     config.node
       .set('__dirname', true)
       .set('__filename', true)
-    // babel-polyfill 加入 entry
-    const entry = config.entry('app')
-    entry
-      .add('babel-polyfill')
-      .end()
     // 判断环境加入模拟数据
+    const entry = config.entry('app')
     if (process.env.VUE_APP_BUILD_MODE !== 'nomock') {
       entry
         .add('@/mock')