diff --git a/babel.config.js b/babel.config.js index ba179669..eceb4cef 100644 --- a/babel.config.js +++ b/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' ] } diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id index 32a3508f..2a147d07 100644 --- a/package-lock.json.REMOVED.git-id +++ b/package-lock.json.REMOVED.git-id @@ -1 +1 @@ -7cd90f8e41f5d7205377cf814f08e634d7d234d6 \ No newline at end of file +aba14ba69c1b10aabcba100e3478b48ba9f2c465 \ No newline at end of file diff --git a/package.json b/package.json index 29f2e676..8204bb4e 100644 --- a/package.json +++ b/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,12 +13,12 @@ "test:unit": "vue-cli-service test:unit" }, "dependencies": { + "@babel/runtime": "^7.2.0", "@d2-projects/d2-crud": "^2.0.3", "@d2-projects/vue-filters-date": "^1.0.2", "@d2-projects/vue-table-export": "^1.0.1", "@d2-projects/vue-table-import": "^1.0.0", "axios": "^0.17.1", - "babel-polyfill": "^6.26.0", "better-scroll": "^1.12.1", "clipboard-polyfill": "^2.4.1", "countup.js": "^1.9.3", @@ -53,6 +53,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", diff --git a/src/components/d2-container/components/d2-source.vue b/src/components/d2-container/components/d2-source.vue index 29590997..5cb52e4b 100644 --- a/src/components/d2-container/components/d2-source.vue +++ b/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 () { diff --git a/src/main.js b/src/main.js index 2b8fc81a..10f3de53 100644 --- a/src/main.js +++ b/src/main.js @@ -1,5 +1,3 @@ -// polyfill -import 'babel-polyfill' // Vue import Vue from 'vue' import App from './App' diff --git a/vue.config.js b/vue.config.js index 16e0f411..8ada6685 100644 --- a/vue.config.js +++ b/vue.config.js @@ -98,7 +98,6 @@ module.exports = { .end() // 重新设置 alias config.resolve.alias - .set('@', resolve('src')) .set('@api', resolve('src/api')) // node config.node @@ -106,9 +105,6 @@ module.exports = { .set('__filename', true) // babel-polyfill 加入 entry const entry = config.entry('app') - entry - .add('babel-polyfill') - .end() // 判断环境加入模拟数据 if (process.env.VUE_APP_BUILD_MODE !== 'nomock') { entry