From 683e5a72681802c5874dfbb45b38f8da04f5b497 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 25 Oct 2019 10:16:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=97=A0jira=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8Dbabel/polyfill=20=E8=A2=AB=E5=A4=9A?= =?UTF-8?q?=E6=AC=A1=E5=BC=95=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webpack/webpack.prod.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack/webpack.prod.js b/webpack/webpack.prod.js index 0049917..619c41a 100644 --- a/webpack/webpack.prod.js +++ b/webpack/webpack.prod.js @@ -12,7 +12,7 @@ module.exports = merge.smart(common, { devtool: 'hidden-source-map', entry: { - show: ['@babel/polyfill', './src/modules/app.ts'], + show: ['@babel/polyfill/noConflict', './src/modules/app.ts'], }, output: { path: dirs.DEST, From 14e9fddf77ebd776a45af7f1acba61fd7cd780d5 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 25 Oct 2019 10:44:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?build:=20=E5=8E=BB=E6=8E=89babel/polyfill?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 - webpack/webpack.dev.js | 4 ++-- webpack/webpack.prod.js | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 764e348..fe532bf 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "@babel/core": "7.4.5", "@babel/plugin-proposal-class-properties": "^7.5.0", "@babel/plugin-proposal-decorators": "7.4.4", - "@babel/polyfill": "7.4.4", "@babel/preset-env": "7.4.5", "@babel/preset-typescript": "7.3.3", "@types/jest": "24.0.11", diff --git a/webpack/webpack.dev.js b/webpack/webpack.dev.js index ec5e10f..8e94d1d 100644 --- a/webpack/webpack.dev.js +++ b/webpack/webpack.dev.js @@ -36,7 +36,7 @@ chokidar module.exports = merge(common, { devtool: 'eval-source-map', entry: { - show: ['@babel/polyfill', './src/i18n.ts', './src/index.ts'], + show: ['./src/i18n.ts', './src/index.ts'], }, output: { path: dirs.DEST, @@ -48,7 +48,7 @@ module.exports = merge(common, { liveReload: true, proxy: { '/webroot/decision/v10': { - target: 'http://localhost:8075', + target: 'http://api.fanruan.design/mock/135', secure: false, }, '/webroot/decision/resources': { diff --git a/webpack/webpack.prod.js b/webpack/webpack.prod.js index 619c41a..d71dcd3 100644 --- a/webpack/webpack.prod.js +++ b/webpack/webpack.prod.js @@ -12,7 +12,7 @@ module.exports = merge.smart(common, { devtool: 'hidden-source-map', entry: { - show: ['@babel/polyfill/noConflict', './src/modules/app.ts'], + show: ['./src/modules/app.ts'], }, output: { path: dirs.DEST, From c685283e7dc951bcd2bbf5295a394fc4b72793fb Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 25 Oct 2019 11:12:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BD=BF=E7=94=A8fineui.min.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 6bac9ec..cfb9c39 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@
- + From 55e81c94af5c4a121d56c3783cbab9d76f8a4146 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 25 Oct 2019 11:18:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webpack/webpack.dev.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack/webpack.dev.js b/webpack/webpack.dev.js index 8e94d1d..f7e3bd1 100644 --- a/webpack/webpack.dev.js +++ b/webpack/webpack.dev.js @@ -48,7 +48,7 @@ module.exports = merge(common, { liveReload: true, proxy: { '/webroot/decision/v10': { - target: 'http://api.fanruan.design/mock/135', + target: 'http://localhost:8075', secure: false, }, '/webroot/decision/resources': {