Skip to content

Commit b3c8fa1

Browse files
文超文超
文超
authored and
文超
committed
issues vuejs#38
1 parent f21019e commit b3c8fa1

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"parse5": "^2.2.2",
4040
"rollup-pluginutils": "^1.5.2",
4141
"vue-template-compiler": "^2.0.3",
42-
"vue-template-es2015-compiler": "^1.2.4",
42+
"vue-template-es2015-compiler": "^1.3.0",
4343
"vue-template-validator": "^1.1.5"
4444
},
4545
"devDependencies": {

src/vueTransform.js

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,14 @@ function injectRender(script, render, lang) {
6060
if (['js', 'babel'].indexOf(lang.toLowerCase()) > -1) {
6161
const matches = /(export default[^{]*\{)/g.exec(script);
6262
if (matches) {
63-
const scriptWithRender = script.split(matches[1])
64-
// buble doesn't support export default, not even with the
65-
// module: false trasforms:
66-
// https://buble.surge.sh/guide/#using-es-modules
67-
.join('module.exports={' +
68-
`render: ${wrapRenderFunction(render.render)},` +
69-
'staticRenderFns: [' +
70-
`${render.staticRenderFns.map(wrapRenderFunction).join(',')}],`
71-
);
72-
return transpileVueTemplate(scriptWithRender, {
63+
let codes = script.split(matches[1]);
64+
65+
const scriptWithRender = 'module.exports={' +
66+
`render: ${wrapRenderFunction(render.render)},` +
67+
'staticRenderFns: [' +
68+
`${render.staticRenderFns.map(wrapRenderFunction).join(',')}], ${codes[1]}`;
69+
70+
return codes[0] + transpileVueTemplate(scriptWithRender, {
7371
// Remove all trasforms added by vue since it's up to the user
7472
// to use whatever he wants
7573
// https://github.com/vuejs/vue-template-es2015-compiler/blob/master/index.js#L6

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1842,9 +1842,9 @@ vue-template-compiler@^2.0.3:
18421842
de-indent "^1.0.2"
18431843
he "^1.1.0"
18441844

1845-
vue-template-es2015-compiler:
1846-
version "1.2.4"
1847-
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.2.4.tgz#f8068d805bd93b0b47afb9dc9f47976f77c8282a"
1845+
vue-template-es2015-compiler@^1.3.0:
1846+
version "1.3.0"
1847+
resolved "http://registry.npm.taobao.org/vue-template-es2015-compiler/download/vue-template-es2015-compiler-1.3.0.tgz#4a0f2a0bbef8b5731f78add8263cd86fe4f643ca"
18481848

18491849
vue-template-validator@^1.1.5:
18501850
version "1.1.5"

0 commit comments

Comments
 (0)