Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
Merge branch 'main' into feature/verbatimModuleSyntax
  • Loading branch information
andrewbranch committed Dec 15, 2022
commit 8816d0ede0edf5a8f72dce55149adc198e4fe1db
16 changes: 14 additions & 2 deletions src/compiler/diagnosticMessages.json
Original file line number Diff line number Diff line change
Expand Up @@ -4273,14 +4273,26 @@
"category": "Error",
"code": 5100
},
"Option '{0}' is redundant and cannot be specified with option '{1}'.": {
"Flag '{0}' is deprecated and will stop functioning in TypeScript {1}. Specify 'ignoreDeprecations: \"{2}\"' to silence this error.": {
"category": "Error",
"code": 5101
},
"Option 'verbatimModuleSyntax' cannot be used when 'module' is set to 'UMD', 'AMD', or 'System'.": {
"Flag '{0}' is deprecated. Please remove it from your configuration.": {
"category": "Error",
"code": 5102
},
"Invalid value for '--ignoreDeprecations'.": {
"category": "Error",
"code": 5103
},
"Option '{0}' is redundant and cannot be specified with option '{1}'.": {
"category": "Error",
"code": 5104
},
"Option 'verbatimModuleSyntax' cannot be used when 'module' is set to 'UMD', 'AMD', or 'System'.": {
"category": "Error",
"code": 5105
},

"Generates a sourcemap for each corresponding '.d.ts' file.": {
"category": "Message",
Expand Down
16 changes: 8 additions & 8 deletions tests/baselines/reference/verbatimModuleSyntaxCompat.errors.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
error TS5095: Option 'preserveValueImports' can only be used when 'module' is set to 'es2015' or later.
error TS5101: Option 'importsNotUsedAsValues' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
error TS5101: Option 'isolatedModules' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
error TS5101: Option 'preserveValueImports' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
error TS5102: Option 'verbatimModuleSyntax' cannot be used when 'module' is set to 'UMD', 'AMD', or 'System'.
error TS5104: Option 'importsNotUsedAsValues' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
error TS5104: Option 'isolatedModules' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
error TS5104: Option 'preserveValueImports' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
error TS5105: Option 'verbatimModuleSyntax' cannot be used when 'module' is set to 'UMD', 'AMD', or 'System'.


!!! error TS5095: Option 'preserveValueImports' can only be used when 'module' is set to 'es2015' or later.
!!! error TS5101: Option 'importsNotUsedAsValues' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
!!! error TS5101: Option 'isolatedModules' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
!!! error TS5101: Option 'preserveValueImports' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
!!! error TS5102: Option 'verbatimModuleSyntax' cannot be used when 'module' is set to 'UMD', 'AMD', or 'System'.
!!! error TS5104: Option 'importsNotUsedAsValues' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
!!! error TS5104: Option 'isolatedModules' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
!!! error TS5104: Option 'preserveValueImports' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
!!! error TS5105: Option 'verbatimModuleSyntax' cannot be used when 'module' is set to 'UMD', 'AMD', or 'System'.
==== tests/cases/conformance/externalModules/verbatimModuleSyntaxCompat.ts (0 errors) ====
export {};
You are viewing a condensed version of this merge commit. You can view the full changes here.