Skip to content

Commit 53fb89c

Browse files
GeoffreyBoothGuillaume Chau
authored andcommitted
Update vue-component to avoid finding and replacing ‘export default’ with ‘return’ in the source code; use proper module syntax instead (#244)
1 parent bbd8961 commit 53fb89c

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

packages/vue-coffee/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This meteor package adds [CoffeeScript](http://coffeescript.org/) support in you
1515
<script lang="coffee">
1616
import { Meteor } from 'meteor/meteor'
1717
18-
return
18+
export default
1919
props: [ 'data' ]
2020
methods:
2121
removePost: ->

packages/vue-component/package.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package.describe({
22
name: 'akryum:vue-component',
3-
version: '0.10.5',
3+
version: '0.10.6',
44
summary: 'VueJS single-file components that hot-reloads',
55
git: 'https://github.com/Akryum/meteor-vue-component',
66
documentation: 'README.md'

packages/vue-component/plugin/regexps.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
jsImportsReg = /import\s+.+\s+from\s+.+;?\s*/g;
2-
jsExportDefaultReg = /export\s+default/g;
31
quoteReg = /'/g;
42
lineReg = /\r?\n|\r/g;
53
tagReg = /<([\w\d-]+)((\s+.*?)*)?\/?>/ig;

packages/vue-component/plugin/tag-handler.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
160160
}
161161

162162
// Export
163-
script = script.replace(jsExportDefaultReg, 'return');
163+
script += `\nreturn require('${this.inputFile.getDisplayPath()}').default;`
164164

165165
// Babel
166166
if(useBabel) {
@@ -226,7 +226,7 @@ VueComponentTagHandler = class VueComponentTagHandler {
226226
map.names = lastMap.names
227227
map.file = this.inputFile.getPathInPackage()
228228

229-
js += '__vue_script__ = (function(){' + script + '\n})();';
229+
js += '__vue_script__ = (function(){ ' + script + '\n})();';
230230
}
231231

232232
// Template

packages/vue-component/plugin/vue-compiler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ function generateJs (vueId, inputFile, compileResult, isHotReload = false) {
556556
const isDev = isDevelopment();
557557
const inputFilePath = inputFile.getPathInPackage();
558558

559-
let js = 'var __vue_script__, __vue_template__;' + compileResult.code;
559+
let js = 'var __vue_script__, __vue_template__; ' + compileResult.code + '\n';
560560
js += `__vue_script__ = __vue_script__ || {};`;
561561
js += `var __vue_options__ = (typeof __vue_script__ === "function" ?
562562
(__vue_script__.options || (__vue_script__.options = {}))

0 commit comments

Comments
 (0)