Skip to content

Commit 1fb3d75

Browse files
committed
Update diagnostic wording in baselines
1 parent bc50c75 commit 1fb3d75

File tree

32 files changed

+81
-54
lines changed

32 files changed

+81
-54
lines changed

tests/baselines/reference/allowImportingTsExtensions(moduleresolution=bundler).errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error TS5095: Option 'bundler' can only be used when 'module' is set to 'es2015' or later.
1+
error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
22
/c.ts(1,16): error TS2307: Cannot find module './thisfiledoesnotexist.ts' or its corresponding type declarations.
33

44

5-
!!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'es2015' or later.
5+
!!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
66
==== /ts.ts (0 errors) ====
77
export {};
88

tests/baselines/reference/api/typescript.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7633,6 +7633,7 @@ declare namespace ts {
76337633
ESNext = 99,
76347634
Node16 = 100,
76357635
NodeNext = 199,
7636+
Preserve = 200,
76367637
}
76377638
enum JsxEmit {
76387639
None = 0,

tests/baselines/reference/bundlerOptionsCompat.errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/tsconfig.json(4,25): error TS5095: Option 'bundler' can only be used when 'module' is set to 'es2015' or later.
1+
/tsconfig.json(4,25): error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
22

33

44
==== /tsconfig.json (1 errors) ====
@@ -7,7 +7,7 @@
77
"module": "commonjs",
88
"moduleResolution": "bundler",
99
~~~~~~~~~
10-
!!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'es2015' or later.
10+
!!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
1111
"noEmit": true
1212
}
1313
}

tests/baselines/reference/conditionalExportsResolutionFallback(moduleresolution=bundler).errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
error TS5095: Option 'bundler' can only be used when 'module' is set to 'es2015' or later.
1+
error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
22

33

4-
!!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'es2015' or later.
4+
!!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
55
==== /node_modules/dep/package.json (0 errors) ====
66
// This documents bug https://github.com/microsoft/TypeScript/issues/50762.
77

tests/baselines/reference/config/commandLineParsing/parseCommandLine/Parse empty options of --module.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ FileNames::
77
0.ts
88
Errors::
99
error TS6044: Compiler option 'module' expects an argument.
10-
error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'nodenext'.
10+
error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'nodenext', 'preserve'.

tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module to compiler-options with json api.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ CompilerOptions::
2525
"configFilePath": "tsconfig.json"
2626
}
2727
Errors::
28-
[91merror[0m[90m TS6046: [0mArgument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'nodenext'.
28+
[91merror[0m[90m TS6046: [0mArgument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'nodenext', 'preserve'.
2929

tests/baselines/reference/config/convertCompilerOptionsFromJson/Convert incorrect option of module to compiler-options with jsonSourceFile api.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CompilerOptions::
2525
"configFilePath": "tsconfig.json"
2626
}
2727
Errors::
28-
[96mtsconfig.json[0m:[93m3[0m:[93m15[0m - [91merror[0m[90m TS6046: [0mArgument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'nodenext'.
28+
[96mtsconfig.json[0m:[93m3[0m:[93m15[0m - [91merror[0m[90m TS6046: [0mArgument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'nodenext', 'preserve'.
2929

3030
3 "module": "",
3131
   ~~

tests/baselines/reference/customConditions(resolvepackagejsonexports=false).errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
error TS5095: Option 'bundler' can only be used when 'module' is set to 'es2015' or later.
1+
error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
22

33

4-
!!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'es2015' or later.
4+
!!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
55
==== /node_modules/lodash/package.json (0 errors) ====
66
{
77
"name": "lodash",

tests/baselines/reference/customConditions(resolvepackagejsonexports=true).errors.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
error TS5095: Option 'bundler' can only be used when 'module' is set to 'es2015' or later.
1+
error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
22

33

4-
!!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'es2015' or later.
4+
!!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
55
==== /node_modules/lodash/package.json (0 errors) ====
66
{
77
"name": "lodash",
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
//// [tests/cases/compiler/emitHelpersWithLocalCollisions.ts] ////
2+
3+
//// [a.ts]
4+
declare var dec: any, __decorate: any;
5+
@dec export class A {
6+
}
7+
8+
const o = { a: 1 };
9+
const y = { ...o };
10+
11+
12+
//// [a.js]
13+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
14+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
15+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
16+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
17+
return c > 3 && r && Object.defineProperty(target, key, r), r;
18+
};
19+
let A = class A {
20+
};
21+
A = __decorate([
22+
dec
23+
], A);
24+
export { A };
25+
const o = { a: 1 };
26+
const y = Object.assign({}, o);

0 commit comments

Comments
 (0)