cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix faulty export default source detection - fixes #406

Browse Source
This commit is contained in:
Sebastian McKenzie 2015-01-07 00:30:41 +11:00
parent bdb8f87480
commit 8c1760bea2
4 changed files with 27 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/6to5/transformation/modules/_default.js
View File

@ -142,10 +142,11 @@ DefaultFormatter.prototype._exportSpecifier = function (getRef, specifier, node,
nodes.push(this._exportsWildcard(getRef(), node)); nodes.push(this._exportsWildcard(getRef(), node));
} else { } else {
var ref; var ref;
if (t.isSpecifierDefault(specifier.id) || this.noInteropRequire) { if (t.isSpecifierDefault(specifier) && !this.noInteropRequire) {
ref = t.memberExpression(getRef(), specifier.id); // importing a default so we need to normalise it
} else {
ref = t.callExpression(this.file.addHelper("interop-require"), [getRef()]); ref = t.callExpression(this.file.addHelper("interop-require"), [getRef()]);
} else {
ref = t.memberExpression(getRef(), specifier.id);
} }
// export { foo } from "test"; // export { foo } from "test";

18
test/fixtures/transformation/es6-modules-amd/exports-from/expected.js vendored
View File

@ -1,10 +1,6 @@
define(["exports", "foo"], function (exports, _foo) { define(["exports", "foo"], function (exports, _foo) {
"use strict"; "use strict";
var _interopRequire = function (obj) {
return obj && (obj["default"] || obj);
};
var _interopRequireWildcard = function (obj) { var _interopRequireWildcard = function (obj) {
return obj && obj.constructor === Object ? obj : { return obj && obj.constructor === Object ? obj : {
"default": obj "default": obj
@ -21,11 +17,11 @@ define(["exports", "foo"], function (exports, _foo) {
_exportsWildcard(_interopRequireWildcard(_foo)); _exportsWildcard(_interopRequireWildcard(_foo));
exports.foo = _interopRequire(_foo); exports.foo = _foo.foo;
exports.foo = _interopRequire(_foo); exports.foo = _foo.foo;
exports.bar = _interopRequire(_foo); exports.bar = _foo.bar;
exports.bar = _interopRequire(_foo); exports.bar = _foo.foo;
exports["default"] = _interopRequire(_foo); exports["default"] = _foo.foo;
exports["default"] = _interopRequire(_foo); exports["default"] = _foo.foo;
exports.bar = _interopRequire(_foo); exports.bar = _foo.bar;
}); });

18
test/fixtures/transformation/es6-modules-common/exports-from/expected.js vendored
View File

@ -1,9 +1,5 @@
"use strict"; "use strict";
var _interopRequire = function (obj) {
return obj && (obj["default"] || obj);
};
var _interopRequireWildcard = function (obj) { var _interopRequireWildcard = function (obj) {
return obj && obj.constructor === Object ? obj : { return obj && obj.constructor === Object ? obj : {
"default": obj "default": obj
@ -20,10 +16,10 @@ var _exportsWildcard = function (obj) {
_exportsWildcard(_interopRequireWildcard(require("foo"))); _exportsWildcard(_interopRequireWildcard(require("foo")));
exports.foo = _interopRequire(require("foo")); exports.foo = require("foo").foo;
exports.foo = _interopRequire(require("foo")); exports.foo = require("foo").foo;
exports.bar = _interopRequire(require("foo")); exports.bar = require("foo").bar;
exports.bar = _interopRequire(require("foo")); exports.bar = require("foo").foo;
exports["default"] = _interopRequire(require("foo")); exports["default"] = require("foo").foo;
exports["default"] = _interopRequire(require("foo")); exports["default"] = require("foo").foo;
exports.bar = _interopRequire(require("foo")); exports.bar = require("foo").bar;

18
test/fixtures/transformation/es6-modules-umd/exports-from/expected.js vendored
View File

@ -7,10 +7,6 @@
})(function (exports, _foo) { })(function (exports, _foo) {
"use strict"; "use strict";
var _interopRequire = function (obj) {
return obj && (obj["default"] || obj);
};
var _interopRequireWildcard = function (obj) { var _interopRequireWildcard = function (obj) {
return obj && obj.constructor === Object ? obj : { return obj && obj.constructor === Object ? obj : {
"default": obj "default": obj
@ -27,11 +23,11 @@
_exportsWildcard(_interopRequireWildcard(_foo)); _exportsWildcard(_interopRequireWildcard(_foo));
exports.foo = _interopRequire(_foo); exports.foo = _foo.foo;
exports.foo = _interopRequire(_foo); exports.foo = _foo.foo;
exports.bar = _interopRequire(_foo); exports.bar = _foo.bar;
exports.bar = _interopRequire(_foo); exports.bar = _foo.foo;
exports["default"] = _interopRequire(_foo); exports["default"] = _foo.foo;
exports["default"] = _interopRequire(_foo); exports["default"] = _foo.foo;
exports.bar = _interopRequire(_foo); exports.bar = _foo.bar;
}); });