Merge branch 'hotfix-exports' into hotfix-ignore-same-name
diff --git a/src/parser.js b/src/parser.js
index 22c1654..cb16ad0 100644
--- a/src/parser.js
+++ b/src/parser.js
@@ -240,7 +240,7 @@
.replace(MODULE_EXPORTS_REG, '__weex_module__.exports')
.replace(REQUIRE_REG, '__weex_require__($1$2$1)')
target = ';__weex_define__("@weex-component/' + name + '", [], ' +
- 'function(__weex_require__, __weex_exports__, __weex_module__)' +
+ 'function(__weex_require__, exports, __weex_module__)' +
'{\n' + target + '\n})'
// record mapOffset into sourcemap
diff --git a/test/expect/exports.we b/test/expect/exports.we
new file mode 100644
index 0000000..731b20a
--- /dev/null
+++ b/test/expect/exports.we
@@ -0,0 +1,11 @@
+<template>
+ <div>
+ <text>{{foo}}</text>
+ </div>
+</template>
+
+<script>
+ exports.data = {
+ foo: 'Hello'
+ }
+</script>
diff --git a/test/test.js b/test/test.js
index a713eb6..fb27960 100644
--- a/test/test.js
+++ b/test/test.js
@@ -139,4 +139,23 @@
checkPos(/console\.log\(9\)/)
checkPos(/console\.log\(0\)/)
})
+
+ it('exports case', function() {
+ var name = 'exports.js';
+
+ var actualCodePath = path.resolve(__dirname, 'actual', name);
+ var actualCodeContent = fs.readFileSync(actualCodePath, { encoding: 'utf8' });
+
+ var expectCodePath = path.resolve(__dirname, 'expect', name);
+ var expectCodeContent = fs.readFileSync(expectCodePath, { encoding: 'utf8' });
+
+
+ var actualResult = createInstance('actual/' + name, actualCodeContent);
+ var actualJson = getRoot('actual/' + name);
+
+ var expectResult = createInstance('expect/' + name, expectCodeContent);
+ var expectJson = getRoot('expect/' + name);
+
+ expect(actualJson).eql(expectJson);
+ });
})
diff --git a/test/webpack.config.js b/test/webpack.config.js
index 3486c8f..5266dae 100644
--- a/test/webpack.config.js
+++ b/test/webpack.config.js
@@ -4,6 +4,7 @@
entry: {
sourcemap: path.resolve(__dirname, 'expect/sourcemap.we?entry=true'),
samename: path.resolve(__dirname, 'expect/samename.we?entry=true'),
+ exports: path.resolve(__dirname, 'expect/exports.we?entry=true'),
a: path.resolve(__dirname, 'a.js?entry=true'),
b: path.resolve(__dirname, 'expect/b.we?entry=true'),
z: path.resolve(__dirname, 'expect/z.we?entry=true')
