Skip to content

Add name to amd definition in umd module if present #18479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/compiler/transformers/module/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ namespace ts {
*/
function transformUMDModule(node: SourceFile) {
const { aliasedModuleNames, unaliasedModuleNames, importAliasNames } = collectAsynchronousDependencies(node, /*includeNonAmdDependencies*/ false);
const moduleName = tryGetModuleNameFromFile(node, host, compilerOptions);
const umdHeader = createFunctionExpression(
/*modifiers*/ undefined,
/*asteriskToken*/ undefined,
Expand Down Expand Up @@ -260,6 +261,8 @@ namespace ts {
createIdentifier("define"),
/*typeArguments*/ undefined,
[
// Add the module name (if provided).
...(moduleName ? [moduleName] : []),
createArrayLiteral([
createLiteral("require"),
createLiteral("exports"),
Expand Down
19 changes: 19 additions & 0 deletions tests/baselines/reference/umdNamedAmdMode.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//// [main.ts]
/// <amd-module name="a"/>
export const a = 1;

//// [main.js]
(function (factory) {
if (typeof module === "object" && typeof module.exports === "object") {
var v = factory(require, exports);
if (v !== undefined) module.exports = v;
}
else if (typeof define === "function" && define.amd) {
define("a", ["require", "exports"], factory);
}
})(function (require, exports) {
"use strict";
exports.__esModule = true;
/// <amd-module name="a"/>
exports.a = 1;
});
5 changes: 5 additions & 0 deletions tests/baselines/reference/umdNamedAmdMode.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
=== tests/cases/compiler/main.ts ===
/// <amd-module name="a"/>
export const a = 1;
>a : Symbol(a, Decl(main.ts, 1, 12))

6 changes: 6 additions & 0 deletions tests/baselines/reference/umdNamedAmdMode.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
=== tests/cases/compiler/main.ts ===
/// <amd-module name="a"/>
export const a = 1;
>a : 1
>1 : 1

4 changes: 4 additions & 0 deletions tests/cases/compiler/umdNamedAmdMode.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// @module: umd
// @filename: main.ts
/// <amd-module name="a"/>
export const a = 1;