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

use path basename as non-default import fallback - fixes #1207

Browse Source
This commit is contained in:
Sebastian McKenzie 2015-04-09 14:36:00 -07:00
parent 1a9f193841
commit 704b31f44f
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/babel/transformation/modules/umd.js
View File

@ -1,6 +1,7 @@
import DefaultFormatter from "./_default";
import AMDFormatter from "./amd";
import values from "lodash/object/values";
import path from "path";
import * as util from "../../util";
import * as t from "../../types";
@ -51,7 +52,7 @@ export default class UMDFormatter extends AMDFormatter {
if (this.passModuleArg) browserArgs.push(t.identifier("mod"));
for (let name in this.ids) {
var id = this.defaultIds[name] || t.identifier(t.toIdentifier(name));
var id = this.defaultIds[name] || t.identifier(t.toIdentifier(path.basename(name, path.extname(name))));
browserArgs.push(t.memberExpression(t.identifier("global"), id));
}

4
test/core/fixtures/transformation/es6.modules-umd/imports/expected.js
View File

@ -7,9 +7,9 @@
var mod = {
exports: {}
};
factory(mod.exports, global.foo, global.fooBar, global.directoryFooBar);
factory(mod.exports, global.foo, global.fooBar, global.fooBar);
global.actual = mod.exports;
}
})(this, function (exports, _foo, _fooBar, _directoryFooBar) {
"use strict";
});
});

1
test/core/fixtures/transformation/es6.modules-umd/non-default-imports/actual.js Normal file
View File

@ -0,0 +1 @@
import { render } from "./lib/render";

15
test/core/fixtures/transformation/es6.modules-umd/non-default-imports/expected.js Normal file
View File

@ -0,0 +1,15 @@
(function (global, factory) {
if (typeof define === "function" && define.amd) {
define(["exports", "./lib/render"], factory);
} else if (typeof exports !== "undefined") {
factory(exports, require("./lib/render"));
} else {
var mod = {
exports: {}
};
factory(mod.exports, global.render);
global.actual = mod.exports;
}
})(this, function (exports, _libRender) {
"use strict";
});

4
test/core/fixtures/transformation/es6.modules-umd/overview/expected.js
View File

@ -7,7 +7,7 @@
var mod = {
exports: {}
};
factory(mod.exports, global.foo2, global.fooBar, global.directoryFooBar);
factory(mod.exports, global.foo2, global.fooBar, global.fooBar);
global.actual = mod.exports;
}
})(this, function (exports, _foo, _fooBar, _directoryFooBar) {
@ -29,4 +29,4 @@
_foo.bar;
_foo.foo;
});
});