Skip to content

Commit ed7febc

Browse files
chenjiahanchenjiahan
authored
[improvement] upgrade babel-preset-jsx (youzan#2452)
1 parent bf50db9 commit ed7febc

File tree

5 files changed

+90
-20
lines changed

5 files changed

+90
-20
lines changed

‎babel.config.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ module.exports = function (api) {
1212
loose: true,
1313
modules: useESModules ? false : 'commonjs'
1414
}
15+
],
16+
[
17+
'@vue/babel-preset-jsx',
18+
{
19+
vModel: true,
20+
injectH: true
21+
}
1522
]
1623
],
1724
plugins: [
@@ -24,7 +31,6 @@ module.exports = function (api) {
2431
useESModules
2532
}
2633
],
27-
'transform-vue-jsx',
2834
'@babel/plugin-syntax-dynamic-import',
2935
'@babel/plugin-transform-object-assign'
3036
]

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@
7777
"@vant/doc": "^1.0.21",
7878
"@vant/eslint-config": "^1.0.8",
7979
"@vant/markdown-loader": "^1.0.3",
80+
"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0-beta.1",
81+
"@vue/babel-preset-jsx": "^1.0.0-beta.1",
8082
"@vue/server-test-utils": "^1.0.0-beta.26",
8183
"@vue/test-utils": "^1.0.0-beta.26",
8284
"autoprefixer": "^9.4.3",
8385
"babel-core": "^7.0.0-0",
84-
"babel-helper-vue-jsx-merge-props": "^2.0.3",
8586
"babel-jest": "^23.6.0",
8687
"babel-loader": "^8.0.4",
87-
"babel-plugin-transform-vue-jsx": "4.0.1",
8888
"codecov": "^3.1.0",
8989
"cross-env": "^5.2.0",
9090
"css-loader": "^2.1.0",

‎packages/badge/test/__snapshots__/demo.spec.js.snap

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ exports[`renders demo correctly 1`] = `
88
<!---->
99
</div>
1010
</a> <a class="van-badge van-hairline">
11-
<div class="van-badge__text">标签名称<div class="van-info van-badge__info">8</div>
11+
<div class="van-badge__text">标签名称
12+
<div class="van-info van-badge__info">8</div>
1213
</div>
1314
</a> <a class="van-badge van-hairline">
14-
<div class="van-badge__text">标签名称<div class="van-info van-badge__info">99</div>
15+
<div class="van-badge__text">标签名称
16+
<div class="van-info van-badge__info">99</div>
1517
</div>
1618
</a> <a class="van-badge van-hairline">
17-
<div class="van-badge__text">标签名称<div class="van-info van-badge__info">99+</div>
19+
<div class="van-badge__text">标签名称
20+
<div class="van-info van-badge__info">99+</div>
1821
</div>
1922
</a></div>
2023
</div>

‎packages/card/test/__snapshots__/demo.spec.js.snap

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@ exports[`renders demo correctly 1`] = `
44
<div>
55
<div>
66
<div class="van-card">
7-
<div class="van-card__header"><a class="van-card__thumb"><img src="//img.yzcdn.cn/upload_files/2017/07/02/af5b9f44deaeb68000d7e4a711160c53.jpg" class="van-card__img"></a>
7+
<div class="van-card__header"><a class="van-card__thumb"><img src="//img.yzcdn.cn/upload_files/2017/07/02/af5b9f44deaeb68000d7e4a711160c53.jpg" class="van-card__img">
8+
</a>
89
<div class="van-card__content">
910
<div class="van-card__title">2018秋冬新款男士休闲时尚军绿飞行夹克秋冬新款男</div>
1011
<div class="van-card__desc van-ellipsis">描述信息</div>
12+
1113
<div class="van-card__bottom">
1214
<div class="van-card__price">¥ 2.00</div>
15+
1316
<div class="van-card__num">x 2</div>
1417
</div>
1518
</div>
@@ -18,7 +21,8 @@ exports[`renders demo correctly 1`] = `
1821
</div>
1922
<div>
2023
<div class="van-card">
21-
<div class="van-card__header"><a class="van-card__thumb"><img src="//img.yzcdn.cn/upload_files/2017/07/02/af5b9f44deaeb68000d7e4a711160c53.jpg" class="van-card__img"><span class="van-tag van-tag--mark van-card__tag" style="background-color:#f44;">标签</span></a>
24+
<div class="van-card__header"><a class="van-card__thumb"><img src="//img.yzcdn.cn/upload_files/2017/07/02/af5b9f44deaeb68000d7e4a711160c53.jpg" class="van-card__img">
25+
<span class="van-tag van-tag--mark van-card__tag" style="background-color:#f44;">标签</span></a>
2226
<div class="van-card__content">
2327
<div class="van-card__title">2018秋冬新款男士休闲时尚军绿飞行夹克秋冬新款男</div>
2428
<div class="van-card__desc van-ellipsis">描述信息</div>

‎yarn.lock

Lines changed: 69 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,70 @@
724724
highlight.js "^9.12.0"
725725
markdown-it "^8.4.0"
726726

727+
"@vue/babel-helper-vue-jsx-merge-props@^1.0.0-beta.1":
728+
version "1.0.0-beta.1"
729+
resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0-beta.1.tgz#cbfa2b4fef05d0462fe770759fe1766ba223c1d1"
730+
integrity sha512-N5uSbvShCF7pMuk4gOoMaM/oAhr4Vt5s1DRnevuhCeRP2UtwDC6GuFFNFuhuefOsWwpAX/PmrSxA6kDH/GGQlg==
731+
732+
"@vue/babel-plugin-transform-vue-jsx@^1.0.0-beta.1":
733+
version "1.0.0-beta.1"
734+
resolved "https://registry.yarnpkg.com/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.0.0-beta.1.tgz#ac1e8577eb6138a6f15025a0b2639cf9accd7b43"
735+
integrity sha512-/ZV09X4BtA5OPdnQqQaxhD1aRBQF8PVY/ZUnQtrk4jld7+Mfy9CxT4gCznoJ+KFooCbyjvwhotB72Hg7N3T4zg==
736+
dependencies:
737+
"@babel/helper-module-imports" "^7.0.0"
738+
"@babel/plugin-syntax-jsx" "^7.2.0"
739+
"@vue/babel-helper-vue-jsx-merge-props" "^1.0.0-beta.1"
740+
html-tags "^2.0.0"
741+
lodash.kebabcase "^4.1.1"
742+
svg-tags "^1.0.0"
743+
744+
"@vue/babel-preset-jsx@^1.0.0-beta.1":
745+
version "1.0.0-beta.1"
746+
resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.0.0-beta.1.tgz#3af92fdc90387851ef7873525d081d193fac2140"
747+
integrity sha512-Nx6+KEJKApsofsYElwFaU7bnBWjMatAgUBFR45qMNl2KpwVOrgNABCbrX/9IqxZIOGCpRuzD96pWmnxFnu2HVQ==
748+
dependencies:
749+
"@vue/babel-helper-vue-jsx-merge-props" "^1.0.0-beta.1"
750+
"@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.1"
751+
"@vue/babel-sugar-functional-vue" "^1.0.0-beta.1"
752+
"@vue/babel-sugar-inject-h" "^1.0.0-beta.1"
753+
"@vue/babel-sugar-v-model" "^1.0.0-beta.1"
754+
"@vue/babel-sugar-v-on" "^1.0.0-beta.1"
755+
756+
"@vue/babel-sugar-functional-vue@^1.0.0-beta.1":
757+
version "1.0.0-beta.1"
758+
resolved "https://registry.yarnpkg.com/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.0.0-beta.1.tgz#9b883d7564c358fda938670cffd4603d5a86bded"
759+
integrity sha512-FD53t0SxlkNtCk78C/fl1WR79tOLYMOEcku0ie0nKhjn/gy56fhYOMlUjutjE/mdVa4wHSHnz2WC7N8e4zbxPg==
760+
dependencies:
761+
"@babel/plugin-syntax-jsx" "^7.2.0"
762+
763+
"@vue/babel-sugar-inject-h@^1.0.0-beta.1":
764+
version "1.0.0-beta.1"
765+
resolved "https://registry.yarnpkg.com/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.0.0-beta.1.tgz#89d56355aa69cc6074e6d28f311566cdb8522ba2"
766+
integrity sha512-/0Key+jZfxjRb1b7NPS29rrYzPXGqoYxRim54eVFzcAF255O5DCcBDbePGb/ktza2aA8ZvzPfnc/uNxcLA82FQ==
767+
dependencies:
768+
"@babel/plugin-syntax-jsx" "^7.2.0"
769+
770+
"@vue/babel-sugar-v-model@^1.0.0-beta.1":
771+
version "1.0.0-beta.1"
772+
resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.0.0-beta.1.tgz#f52a67bfe235f34478fc5804453415231fb0d213"
773+
integrity sha512-TLcBppivEHL9oeAafLfxBG3M4FFnVp1BX8joBJwvfgMOFgarNux8QhttbqQSMAAVX4j6GOf1xlXpXK2odQHB0w==
774+
dependencies:
775+
"@babel/plugin-syntax-jsx" "^7.2.0"
776+
"@vue/babel-helper-vue-jsx-merge-props" "^1.0.0-beta.1"
777+
"@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.1"
778+
camelcase "^5.0.0"
779+
html-tags "^2.0.0"
780+
svg-tags "^1.0.0"
781+
782+
"@vue/babel-sugar-v-on@^1.0.0-beta.1":
783+
version "1.0.0-beta.1"
784+
resolved "https://registry.yarnpkg.com/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.0.0-beta.1.tgz#2c98417ac625bbf1bad11fc3e103b7b6558fcb0e"
785+
integrity sha512-K+QecqeKZseWoGkxMAuV08XqumPqBpQ681NwFsSZyj6Pfz5XpEPPlCH3nQ+7KC4yxjbH9bjIGVtkpvbONIfbvA==
786+
dependencies:
787+
"@babel/plugin-syntax-jsx" "^7.2.0"
788+
"@vue/babel-plugin-transform-vue-jsx" "^1.0.0-beta.1"
789+
camelcase "^5.0.0"
790+
727791
"@vue/component-compiler-utils@^2.0.0":
728792
version "2.3.1"
729793
resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.3.1.tgz#d1c2623f02ad3fe6b6fc9c3762be55c9c61e3977"
@@ -1360,11 +1424,6 @@ babel-generator@^6.18.0, babel-generator@^6.26.0:
13601424
source-map "^0.5.7"
13611425
trim-right "^1.0.1"
13621426

1363-
babel-helper-vue-jsx-merge-props@^2.0.3:
1364-
version "2.0.3"
1365-
resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6"
1366-
integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==
1367-
13681427
babel-helpers@^6.24.1:
13691428
version "6.24.1"
13701429
resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
@@ -1427,13 +1486,6 @@ babel-plugin-transform-strict-mode@^6.24.1:
14271486
babel-runtime "^6.22.0"
14281487
babel-types "^6.24.1"
14291488

1430-
babel-plugin-transform-vue-jsx@4.0.1:
1431-
version "4.0.1"
1432-
resolved "https://registry.yarnpkg.com/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-4.0.1.tgz#2c8bddce87a6ef09eaa59869ff1bfbeeafc5f88d"
1433-
integrity sha512-wbOz7ITB5cloLSjKUU1hWn8zhR+Dwah/RZiTiJY/CQliCwhowmzu6m7NEF+y5EJX/blDzGjRtZvC10Vdb3Q7vw==
1434-
dependencies:
1435-
esutils "^2.0.2"
1436-
14371489
babel-preset-jest@^23.2.0:
14381490
version "23.2.0"
14391491
resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
@@ -5651,6 +5703,11 @@ lodash.isarray@^3.0.0:
56515703
version "3.0.4"
56525704
resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
56535705

5706+
lodash.kebabcase@^4.1.1:
5707+
version "4.1.1"
5708+
resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
5709+
integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY=
5710+
56545711
lodash.keys@^3.0.0:
56555712
version "3.1.2"
56565713
resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"

0 commit comments

Comments
 (0)