From 23a90001a2867959fb8823e3ee4d37d8cf0147b9 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Mon, 19 Mar 2018 19:09:30 +0800
Subject: [PATCH] fix babelconfig

---
 antd-tools/getBabelCommonConfig.js |  3 +--
 antd-tools/gulpfile.js             |  5 +++--
 webpack.base.config.js             | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/antd-tools/getBabelCommonConfig.js b/antd-tools/getBabelCommonConfig.js
index 0f7f28a44..b65885420 100644
--- a/antd-tools/getBabelCommonConfig.js
+++ b/antd-tools/getBabelCommonConfig.js
@@ -2,12 +2,11 @@
 
 module.exports = function (modules) {
   const plugins = [
-    // require.resolve('babel-plugin-transform-vue-jsx'),
+    require.resolve('babel-plugin-transform-vue-jsx'),
     require.resolve('babel-plugin-transform-es3-member-expression-literals'),
     require.resolve('babel-plugin-transform-es3-property-literals'),
     require.resolve('babel-plugin-transform-object-assign'),
     require.resolve('babel-plugin-transform-object-rest-spread'),
-    require.resolve('babel-plugin-transform-decorators-legacy'),
   ]
   plugins.push([require.resolve('babel-plugin-transform-runtime'), {
     polyfill: false,
diff --git a/antd-tools/gulpfile.js b/antd-tools/gulpfile.js
index 6c48d3c44..b1585c3dc 100644
--- a/antd-tools/gulpfile.js
+++ b/antd-tools/gulpfile.js
@@ -123,9 +123,10 @@ function compile (modules) {
   const source = [
     'components/**/*.js',
     'components/**/*.jsx',
+    '!components/vc-slider/**/*', // exclude vc-slider
   ]
-  const tsFilesStream = babelify(gulp.src(source), modules)
-  return merge2([less, tsFilesStream, assets])
+  const jsFilesStream = babelify(gulp.src(source), modules)
+  return merge2([less, jsFilesStream, assets])
 }
 
 gulp.task('dist', (done) => {
diff --git a/webpack.base.config.js b/webpack.base.config.js
index b3fe2907b..a54baa1a2 100644
--- a/webpack.base.config.js
+++ b/webpack.base.config.js
@@ -2,6 +2,10 @@ const path = require('path')
 const hljs = require('highlight.js')
 const Token = require('markdown-it/lib/token')
 const cheerio = require('cheerio')
+const getBabelCommonConfig = require('./antd-tools/getBabelCommonConfig')
+const babelConfig = getBabelCommonConfig(false)
+
+babelConfig.plugins.push(require.resolve('babel-plugin-syntax-dynamic-import'))
 
 const fetch = (str, tag) => {
   const $ = cheerio.load(str, { decodeEntities: false, xmlMode: true })
@@ -124,10 +128,26 @@ module.exports = {
       {
         test: /\.vue$/,
         loader: 'vue-loader',
+        options: {
+          loaders: {
+            js: [
+              { loader: 'babel-loader',
+                options: {
+                  presets: ['env'],
+                  plugins: [
+                    'transform-vue-jsx',
+                    'transform-object-rest-spread',
+                    'syntax-dynamic-import',
+                  ],
+                }},
+            ],
+          },
+        },
       },
       {
         test: /\.(js|jsx)$/,
         loader: 'babel-loader', exclude: /node_modules/,
+        options: babelConfig,
       },
       {
         test: /\.(png|jpg|gif|svg)$/,