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

Merge branch 'source-map-reenter' of https://github.com/kpdecker/babel into kpdecker-source-map-reenter

Browse Source 
Conflicts:
	packages/babel-generator/src/printer.js
This commit is contained in:
Sebastian McKenzie
2016-01-18 18:36:57 +00:00
parent f957ebde39 9e382b1686
commit 65a4c8f4a4
20 changed files with 97 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/babel-plugin-transform-es2015-modules-commonjs/src/index.js
View File

@@ -330,7 +330,7 @@ export default function () {
]));
}
}
remaps[specifier.local.name] = t.memberExpression(target, specifier.imported);
remaps[specifier.local.name] = t.memberExpression(target, t.cloneWithoutLoc(specifier.imported));
}
}
} else {

2
packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/actual.js vendored
View File

@@ -9,7 +9,7 @@ import {foo as bar2} from "foo5";
export {test};
export var test = 5;
bar(foo);
bar(foo, bar2);
/* my comment */
bar2;

4
packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/expected.js vendored
View File

@@ -26,8 +26,8 @@ var _foo5 = require("foo5");
exports. /*after*/test = test;
var test = /*before*/exports. /*after*/test = 5;
/*before*/(0, _foo4. /*after*/bar)( /*before*/_foo2.default) /*after*/;
/*before*/(0, _foo4.bar) /*after*/( /*before*/_foo2.default /*after*/, /*before*/_foo5.foo /*after*/);
/* my comment */
/*before*/_foo5. /*after*/foo;
/*before*/_foo5.foo; /*after*/
/*before*/_foo2.default; /*after*/

1
packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/import/actual.js vendored
View File

@@ -6,3 +6,4 @@ import * as foo4 from "foo";
foo;
foo2;
foo3;
foo3();

3
packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/import/expected.js vendored
View File

@@ -4,4 +4,5 @@ var _foo = require("foo");
_foo.default;
_foo.default;
_foo.foo3;
_foo.foo3;
(0, _foo.foo3)();

43
packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/import/source-mappings.json vendored Normal file
View File

@@ -0,0 +1,43 @@
[{
"original": {
"line": 6, "column": 0
},
"generated": {
"line": 5, "column": 0
}
},{
"original": {
"line": 6, "column": 0
},
"generated": {
"line": 5, "column": 12
}
},{
"original": {
"line": 8, "column": 0
},
"generated": {
"line": 7, "column": 0
}
},{
"original": {
"line": 8, "column": 0
},
"generated": {
"line": 7, "column": 9
}
},{
"original": {
"line": 9, "column": 0
},
"generated": {
"line": 8, "column": 0
}
},{
"original": {
"line": 9, "column": 0
},
"generated": {
"line": 8, "column": 9
}
}]