Skip to content
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.

Sign up for GitHub

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

External module bundling #4754

Closed
wants to merge 17 commits into from
Closed

External module bundling #4754

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
487ee08
commonjs bundling implementation
weswigham Sep 11, 2015
9d340d9
Emit for all module outputs, disable es6 module output when bundling
weswigham Sep 11, 2015
9840aa4
fix style nits
weswigham Sep 11, 2015
826e78b
fix more style
weswigham Sep 11, 2015
fcf3355
use for-of instead of forEach
weswigham Sep 11, 2015
67c1fac
accept baselines
weswigham Sep 12, 2015
b79d4c6
Fix system emit
weswigham Sep 14, 2015
773fd1f
Merge branch 'master' into external-module-bundling
weswigham Sep 15, 2015
2ea714d
Handle external module references in amd/umd/system
weswigham Sep 16, 2015
3b7ad59
Throw on module resolution failure
weswigham Sep 16, 2015
aa18b11
Indent case, other cleanup
weswigham Sep 16, 2015
f73c3e4
Merge with master
weswigham Sep 16, 2015
55287c1
bundle test
weswigham Sep 16, 2015
512e928
test cases galore
weswigham Sep 17, 2015
4f96c18
merge with master
weswigham Sep 25, 2015
5d73d45
Fix tests/system emit, working sfx bundle, none is valid module kind
weswigham Sep 25, 2015
529e48d
ES6 emit, fix compiler tests current directory
weswigham Sep 29, 2015
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
8 changes: 7 additions & 1 deletion src/compiler/commandLineParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,13 @@ namespace ts {
"classic": ModuleResolutionKind.Classic
},
description: Diagnostics.Specifies_module_resolution_strategy_Colon_node_Node_or_classic_TypeScript_pre_1_6
}
},
{
name: "bundle",
type: "string",
isFilePath: true,
description: Diagnostics.Specifies_entrypoint_file_for_bundling
}
];

/* @internal */
Expand Down
4 changes: 3 additions & 1 deletion src/compiler/diagnosticInformationMap.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ namespace ts {
Line_terminator_not_permitted_before_arrow: { code: 1200, category: DiagnosticCategory.Error, key: "Line terminator not permitted before arrow." },
Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_or_higher_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_or_import_d_from_mod_instead: { code: 1202, category: DiagnosticCategory.Error, key: "Import assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'import * as ns from \"mod\"', 'import {a} from \"mod\"' or 'import d from \"mod\"' instead." },
Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_or_higher_Consider_using_export_default_instead: { code: 1203, category: DiagnosticCategory.Error, key: "Export assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'export default' instead." },
Cannot_compile_modules_into_commonjs_amd_system_or_umd_when_targeting_ES6_or_higher: { code: 1204, category: DiagnosticCategory.Error, key: "Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher." },
Cannot_compile_modules_into_commonjs_amd_system_or_umd_when_targeting_ES6_or_higher_unless_bundle_is_specified: { code: 1204, category: DiagnosticCategory.Error, key: "Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher unless --bundle is specified." },
Decorators_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1205, category: DiagnosticCategory.Error, key: "Decorators are only available when targeting ECMAScript 5 and higher." },
Decorators_are_not_valid_here: { code: 1206, category: DiagnosticCategory.Error, key: "Decorators are not valid here." },
Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: { code: 1207, category: DiagnosticCategory.Error, key: "Decorators cannot be applied to multiple get/set accessors of the same name." },
Expand Down Expand Up @@ -513,6 +513,7 @@ namespace ts {
Option_0_cannot_be_specified_without_specifying_option_1: { code: 5052, category: DiagnosticCategory.Error, key: "Option '{0}' cannot be specified without specifying option '{1}'." },
Option_0_cannot_be_specified_with_option_1: { code: 5053, category: DiagnosticCategory.Error, key: "Option '{0}' cannot be specified with option '{1}'." },
A_tsconfig_json_file_is_already_defined_at_Colon_0: { code: 5053, category: DiagnosticCategory.Error, key: "A 'tsconfig.json' file is already defined at: '{0}'." },
Option_0_requires_both_1_and_2: { code: 5055, category: DiagnosticCategory.Error, key: "Option '{0}' requires both '{1}' and '{2}'." },
Concatenate_and_emit_output_to_single_file: { code: 6001, category: DiagnosticCategory.Message, key: "Concatenate and emit output to single file." },
Generates_corresponding_d_ts_file: { code: 6002, category: DiagnosticCategory.Message, key: "Generates corresponding '.d.ts' file." },
Specifies_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: DiagnosticCategory.Message, key: "Specifies the location where debugger should locate map files instead of generated locations." },
Expand Down Expand Up @@ -571,6 +572,7 @@ namespace ts {
Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: { code: 6070, category: DiagnosticCategory.Message, key: "Initializes a TypeScript project and creates a tsconfig.json file." },
Successfully_created_a_tsconfig_json_file: { code: 6071, category: DiagnosticCategory.Message, key: "Successfully created a tsconfig.json file." },
Suppress_excess_property_checks_for_object_literals: { code: 6072, category: DiagnosticCategory.Message, key: "Suppress excess property checks for object literals." },
Specifies_entrypoint_file_for_bundling: { code: 6073, category: DiagnosticCategory.Message, key: "Specifies entrypoint file for bundling." },
Variable_0_implicitly_has_an_1_type: { code: 7005, category: DiagnosticCategory.Error, key: "Variable '{0}' implicitly has an '{1}' type." },
Parameter_0_implicitly_has_an_1_type: { code: 7006, category: DiagnosticCategory.Error, key: "Parameter '{0}' implicitly has an '{1}' type." },
Member_0_implicitly_has_an_1_type: { code: 7008, category: DiagnosticCategory.Error, key: "Member '{0}' implicitly has an '{1}' type." },
Expand Down
10 changes: 9 additions & 1 deletion src/compiler/diagnosticMessages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@
"category": "Error",
"code": 1203
},
"Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.": {
"Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher unless --bundle is specified.": {
"category": "Error",
"code": 1204
},
Expand Down Expand Up @@ -2042,6 +2042,10 @@
"category": "Error",
"code": 5053
},
"Option '{0}' requires both '{1}' and '{2}'.": {
"category": "Error",
"code": 5055
},

"Concatenate and emit output to single file.": {
"category": "Message",
Expand Down Expand Up @@ -2275,6 +2279,10 @@
"category": "Message",
"code": 6072
},
"Specifies entrypoint file for bundling.": {
"category": "Message",
"code": 6073
},

"Variable '{0}' implicitly has an '{1}' type.": {
"category": "Error",
Expand Down
Loading