From cf4edceca6fb6d1042b0ec4092f2e83bbc134706 Mon Sep 17 00:00:00 2001
From: undefined <undefined>
Date: Mon, 7 Sep 2020 22:28:29 +0800
Subject: [PATCH] chore: update to @vue/babel-plugin-jsx

---
 antd-tools/getBabelCommonConfig.js | 2 +-
 antd-tools/getWebpackConfig.js     | 2 +-
 antdv-demo                         | 2 +-
 babel.config.js                    | 2 +-
 package.json                       | 2 +-
 webpack.config.js                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/antd-tools/getBabelCommonConfig.js b/antd-tools/getBabelCommonConfig.js
index cd6b14caa..b6886ea4e 100644
--- a/antd-tools/getBabelCommonConfig.js
+++ b/antd-tools/getBabelCommonConfig.js
@@ -2,7 +2,7 @@
 
 module.exports = function(modules) {
   const plugins = [
-    require.resolve('@ant-design-vue/babel-plugin-jsx'),
+    require.resolve('@vue/babel-plugin-jsx'),
     require.resolve('@babel/plugin-proposal-optional-chaining'),
     require.resolve('@babel/plugin-transform-object-assign'),
     require.resolve('@babel/plugin-proposal-object-rest-spread'),
diff --git a/antd-tools/getWebpackConfig.js b/antd-tools/getWebpackConfig.js
index 4efa0822a..5c2e646fc 100644
--- a/antd-tools/getWebpackConfig.js
+++ b/antd-tools/getWebpackConfig.js
@@ -83,7 +83,7 @@ function getWebpackConfig(modules) {
                       options: {
                         presets: [require.resolve('@babel/preset-env')],
                         plugins: [
-                          require.resolve('@ant-design-vue/babel-plugin-jsx'),
+                          require.resolve('@vue/babel-plugin-jsx'),
                           require.resolve('@babel/plugin-proposal-object-rest-spread'),
                         ],
                       },
diff --git a/antdv-demo b/antdv-demo
index 781e98fde..a581157ea 160000
--- a/antdv-demo
+++ b/antdv-demo
@@ -1 +1 @@
-Subproject commit 781e98fde2744f187082905da6ab2df5d45770df
+Subproject commit a581157eaeca312744b551b7eda653f3059a9065
diff --git a/babel.config.js b/babel.config.js
index c0bd6b4be..58c70b70a 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -3,7 +3,7 @@ module.exports = {
     test: {
       presets: [['@babel/preset-env', { targets: { node: true } }]],
       plugins: [
-        ['@ant-design-vue/babel-plugin-jsx'],
+        ['@vue/babel-plugin-jsx'],
         '@babel/plugin-proposal-optional-chaining',
         '@babel/plugin-transform-object-assign',
         '@babel/plugin-proposal-object-rest-spread',
diff --git a/package.json b/package.json
index 7c0d0737b..5dfba1398 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,6 @@
     "vue": ">=3.0.0"
   },
   "devDependencies": {
-    "@ant-design-vue/babel-plugin-jsx": "^1.0.0-rc.1",
     "@babel/cli": "^7.8.4",
     "@babel/core": "^7.10.5",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
@@ -79,6 +78,7 @@
     "@commitlint/cli": "^8.0.0",
     "@commitlint/config-conventional": "^8.0.0",
     "@octokit/rest": "^16.0.0",
+    "@vue/babel-plugin-jsx": "^1.0.0-rc.2",
     "@vue/cli-plugin-eslint": "^4.0.0",
     "@vue/compiler-sfc": "^3.0.0-rc.5",
     "@vue/server-test-utils": "1.0.0-beta.16",
diff --git a/webpack.config.js b/webpack.config.js
index 29abdb915..282cab943 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -52,7 +52,7 @@ module.exports = {
                 style: true,
               },
             ],
-            ['@ant-design-vue/babel-plugin-jsx', { transformOn: true, usePatchFlag: false }],
+            ['@vue/babel-plugin-jsx'],
             '@babel/plugin-proposal-optional-chaining',
             '@babel/plugin-transform-object-assign',
             '@babel/plugin-proposal-object-rest-spread',