From c92075fadfa669cd640cd9ef56b8f00389cce633 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 17 Jan 2019 10:28:56 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA=20lint?= =?UTF-8?q?=20=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 5505242d5501cff532dcacec543129d77422e580 [formerly 5505242d5501cff532dcacec543129d77422e580 [formerly 5505242d5501cff532dcacec543129d77422e580 [formerly 5505242d5501cff532dcacec543129d77422e580 [formerly 1b52ff7180392201a562a8b1619ee25dbf15c64b [formerly f4420b0e04780b3d0b7e1ac67d6a145cadc56c3b]]]]] Former-commit-id: f3246a354dcfcaffa3f02c0a9e18f1ca303452a0 Former-commit-id: 4b6c84eefb0c8f9262b2ecbca58e13803c58483f Former-commit-id: c5edecc6d80b3b88a32e5cfaaa0b263ce53b8dce [formerly 315dca8ed63156b089099db50051595e8ca88a96] Former-commit-id: d3a9c4a5b4277354c889f6f5319542d503d91d7f Former-commit-id: 7682a5465efdd43c764accbae261566cdf0d1541 Former-commit-id: 0974ed226e23bbaa4c5c81e6714648a2c0a08348 Former-commit-id: 5adeea97691f4647f979ad00d6936768e7252520 Former-commit-id: 343caa43f23976f314ee335c005a7bb7fe1723db --- src/components/d2-container/components/d2-source.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 () { From 3b95151d1577014527299aeaf7803f158869219f Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 17 Jan 2019 10:29:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 47b43b40c703de28339ff01006fa58af0ddd2bc0 [formerly 47b43b40c703de28339ff01006fa58af0ddd2bc0 [formerly 47b43b40c703de28339ff01006fa58af0ddd2bc0 [formerly 47b43b40c703de28339ff01006fa58af0ddd2bc0 [formerly 91914baef9f870df42621cfc7a32a751adbb01f0 [formerly 230b2277f828e34fdf1e57aca8695e1d5fa1fae2]]]]] Former-commit-id: 8d45820a0920c2e677e658556fea4e519a156240 Former-commit-id: 3098b13da5f960f9eea8e718f22a8b0f81113969 Former-commit-id: fcc7ea1397e75866c961ff82ba81b0a296dde1f0 [formerly 283374be9ef07d5340d36bca7b3349e3d04e14f4] Former-commit-id: f1a63fe5ae80545ce459551c6e85437522ef7729 Former-commit-id: aa17d43a0a45964de5d86a46531fe88694639c55 Former-commit-id: b8aef43295091a430796144272346d950990cf6b Former-commit-id: f14e0e12d7e0a9800a8f76c2b41f0487d3dad24d Former-commit-id: 6d70c6f93f8d2604033da04c0b7287170c570585 --- package-lock.json.REMOVED.git-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id index 32a3508f..0beccb92 100644 --- a/package-lock.json.REMOVED.git-id +++ b/package-lock.json.REMOVED.git-id @@ -1 +1 @@ -7cd90f8e41f5d7205377cf814f08e634d7d234d6 \ No newline at end of file +2ef1ec5879fe6ed0d41075962418f0b73b99f8e8 \ No newline at end of file From 48b6df0e94c690fc2247706ae648b09853e17e42 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 17 Jan 2019 10:46:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E9=A2=9D=E5=A4=96=E5=A3=B0=E6=98=8E=20@?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: af100eec2cf014df3dd02dc13bc9f326e924bb50 [formerly bd91d6a3f4e2fee80a6d2479326d8fde71b57d7f] [formerly af100eec2cf014df3dd02dc13bc9f326e924bb50 [formerly bd91d6a3f4e2fee80a6d2479326d8fde71b57d7f] [formerly af100eec2cf014df3dd02dc13bc9f326e924bb50 [formerly bd91d6a3f4e2fee80a6d2479326d8fde71b57d7f] [formerly bd91d6a3f4e2fee80a6d2479326d8fde71b57d7f [formerly 79db39d4983b2bb5c19ab34ae97eeb587c49920e [formerly d74312dcfae0b52d11f1e41e19f551ac46385b25]]]]] Former-commit-id: 562cb6743b977a37f0895ee85f88b37189bf0d28 Former-commit-id: c27a7b728ca78b56b2db8aca1f4d0097f9b317f0 Former-commit-id: c4e0f98345fd1b625e52f5983c9d44e5c5280a23 [formerly b7a5a227d6f0c3815f094429c71d4a19afedcd58] Former-commit-id: 13c0584de25d82bd2c4ebd1d89fb1519bfe783bd Former-commit-id: 9591c7bf2cacb84cefa53327a44fa2cba4397f73 Former-commit-id: 128d5357be36fed1f6b7f2510aa5d221076cf8d8 Former-commit-id: cf9f9230b10b45807accf5cb9b051300ab6c3ad0 Former-commit-id: ba83aa63a959940ce3b7f4c4fafe93ddbd4ef16a --- vue.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index 16e0f411..3a5eabfd 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 From 4ab0ad88dfabc1f7a4f81e91888b9f0f07bbe354 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 17 Jan 2019 10:53:40 +0800 Subject: [PATCH 4/5] babel-polyfill -> babel-plugin-transform-runtime Former-commit-id: 91b1410db81cbc53bad8410e0ff9a5983526bb90 [formerly 91b1410db81cbc53bad8410e0ff9a5983526bb90 [formerly 91b1410db81cbc53bad8410e0ff9a5983526bb90 [formerly 91b1410db81cbc53bad8410e0ff9a5983526bb90 [formerly 5ac13021252ae46346e61a5977643202940593ca [formerly ba010d9c814fe0d509290e4d71931f97cf82a045]]]]] Former-commit-id: a0abaddb616206871f6e123470f61071c3a0afcc Former-commit-id: 269c21888c5aff56c3494302a14ded1c25665db8 Former-commit-id: 989200b6c31e8255b45b2f2346b0e72305d3adab [formerly ff28b98df3151ee12e961e181fbcde78445ad358] Former-commit-id: b23c04f7bc330923198ecf91934e15b697607e3f Former-commit-id: 5409541a2c7fd1438f084ca9a2c04e2375114faf Former-commit-id: afdb7af250490690342e19549746d52b9023778a Former-commit-id: 555b5406052c7883d4349a4bde178ef8e38185cb Former-commit-id: a26cea56915e813019307ddf01fb3c2125ba724b --- babel.config.js | 4 ++++ package-lock.json.REMOVED.git-id | 2 +- package.json | 3 ++- src/main.js | 2 -- vue.config.js | 3 --- 5 files changed, 7 insertions(+), 7 deletions(-) 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 0beccb92..2a147d07 100644 --- a/package-lock.json.REMOVED.git-id +++ b/package-lock.json.REMOVED.git-id @@ -1 +1 @@ -2ef1ec5879fe6ed0d41075962418f0b73b99f8e8 \ No newline at end of file +aba14ba69c1b10aabcba100e3478b48ba9f2c465 \ No newline at end of file diff --git a/package.json b/package.json index 29f2e676..905af1fd 100644 --- a/package.json +++ b/package.json @@ -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/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 3a5eabfd..8ada6685 100644 --- a/vue.config.js +++ b/vue.config.js @@ -105,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 From bf382ab43f7f3c49d5e46ff5e37e478c86b0f564 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Thu, 17 Jan 2019 10:55:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: ba3fd2712c78898077162a5b3ccdf79187568a80 [formerly ba3fd2712c78898077162a5b3ccdf79187568a80 [formerly ba3fd2712c78898077162a5b3ccdf79187568a80 [formerly ba3fd2712c78898077162a5b3ccdf79187568a80 [formerly 12d35888507f591d3e81237251113df2ae1e0831 [formerly a1c73972e8821e7aab3bf39d84d205e1468aeb33]]]]] Former-commit-id: 8f945073b4e082006be5290328e1eb0e35259198 Former-commit-id: 977cc57924dbd1e19b3e9b8b8eb987844c82357d Former-commit-id: dcdb3cf4147ab2fbc11bdd3d133521f121a2a61d [formerly c8fe898be9dc4679a7de7a006d4b04073f8d3589] Former-commit-id: 170e29a21cffd62fc63b3f1c7405e14aa88bfbdc Former-commit-id: d1edacf12b1ce3514cfb61710df792a3ddc83e75 Former-commit-id: 5cc9b0dcbfdc1b1b937e604a52214b25c5d4e083 Former-commit-id: 104cd484d75d35ce90e699ef514b77116e64d335 Former-commit-id: 6f644a7ef627a5bd6ce63ed7d2b49bd025038d50 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 905af1fd..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",