From de7c7eeda54439f265003cd6c75c93b06c2c290d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 3 Sep 2025 23:30:02 +0000 Subject: [PATCH] Update some baseUrl tests to ignore deprecations Co-authored-by: DanielRosenwasser <972891+DanielRosenwasser@users.noreply.github.com> --- ...gBasedModuleResolution2_classic.errors.txt | 20 ------------------- ...gBasedModuleResolution4_classic.trace.json | 7 ------- ...thMappingBasedModuleResolution2_classic.ts | 17 ++++++++-------- ...thMappingBasedModuleResolution3_classic.ts | 7 ++++--- .../pathMappingBasedModuleResolution3_node.ts | 7 ++++--- ...thMappingBasedModuleResolution4_classic.ts | 11 +++++----- 6 files changed, 23 insertions(+), 46 deletions(-) delete mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt deleted file mode 100644 index 3f4b7a24edf..00000000000 --- a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt +++ /dev/null @@ -1,20 +0,0 @@ -root/tsconfig.json(5,13): error TS5061: Pattern '*1*' can have at most one '*' character. -root/tsconfig.json(5,22): error TS5062: Substitution '*2*' in pattern '*1*' can have at most one '*' character. - - -==== root/tsconfig.json (2 errors) ==== - { - "compilerOptions": { - "baseUrl": "./src", - "paths": { - "*1*": [ "*2*" ] - ~~~~~ -!!! error TS5061: Pattern '*1*' can have at most one '*' character. - ~~~~~ -!!! error TS5062: Substitution '*2*' in pattern '*1*' can have at most one '*' character. - } - } - } - -==== root/src/folder1/file1.ts (0 errors) ==== - export var x = 1; \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.trace.json b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.trace.json index f00232b0c51..209824efbe1 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.trace.json +++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.trace.json @@ -1,8 +1,6 @@ [ "======== Resolving module 'folder2/file2' from 'c:/root/folder1/file1.ts'. ========", "Explicitly specified module resolution kind: 'Classic'.", - "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'folder2/file2'.", - "Resolving module name 'folder2/file2' relative to base url 'c:/root' - 'c:/root/folder2/file2'.", "File 'c:/root/folder2/file2.ts' exists - use it as a name resolution result.", "======== Module name 'folder2/file2' was successfully resolved to 'c:/root/folder2/file2.ts'. ========", "======== Resolving module './file3' from 'c:/root/folder2/file2.ts'. ========", @@ -11,11 +9,6 @@ "======== Module name './file3' was successfully resolved to 'c:/root/folder2/file3.ts'. ========", "======== Resolving module 'file4' from 'c:/root/folder2/file2.ts'. ========", "Explicitly specified module resolution kind: 'Classic'.", - "'baseUrl' option is set to 'c:/root', using this value to resolve non-relative module name 'file4'.", - "Resolving module name 'file4' relative to base url 'c:/root' - 'c:/root/file4'.", - "File 'c:/root/file4.ts' does not exist.", - "File 'c:/root/file4.tsx' does not exist.", - "File 'c:/root/file4.d.ts' does not exist.", "File 'c:/root/folder2/file4.ts' does not exist.", "File 'c:/root/folder2/file4.tsx' does not exist.", "File 'c:/root/folder2/file4.d.ts' does not exist.", diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution2_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution2_classic.ts index f24e857fa41..af258555a23 100644 --- a/tests/cases/compiler/pathMappingBasedModuleResolution2_classic.ts +++ b/tests/cases/compiler/pathMappingBasedModuleResolution2_classic.ts @@ -4,14 +4,15 @@ // baseurl is defined in tsconfig.json // paths has errors -// @filename: root/tsconfig.json -{ - "compilerOptions": { - "baseUrl": "./src", - "paths": { - "*1*": [ "*2*" ] - } - } +// @filename: root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": "./src", + "paths": { + "*1*": [ "*2*" ] + }, + "ignoreDeprecations": "6.0" + } } // @filename: root/src/folder1/file1.ts diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution3_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution3_classic.ts index 350346adebc..3166ce00369 100644 --- a/tests/cases/compiler/pathMappingBasedModuleResolution3_classic.ts +++ b/tests/cases/compiler/pathMappingBasedModuleResolution3_classic.ts @@ -1,6 +1,7 @@ -// @moduleResolution: classic -// @module: amd -// @baseUrl: c:/root +// @moduleResolution: classic +// @module: amd +// @baseUrl: c:/root +// @ignoreDeprecations: 6.0 // @traceResolution: true // baseUrl set via command line diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution3_node.ts b/tests/cases/compiler/pathMappingBasedModuleResolution3_node.ts index 400a3b4ea3d..353a349591f 100644 --- a/tests/cases/compiler/pathMappingBasedModuleResolution3_node.ts +++ b/tests/cases/compiler/pathMappingBasedModuleResolution3_node.ts @@ -1,6 +1,7 @@ -// @moduleResolution: bundler -// @module: commonjs -// @baseUrl: c:/root +// @moduleResolution: bundler +// @module: commonjs +// @baseUrl: c:/root +// @ignoreDeprecations: 6.0 // @traceResolution: true // baseUrl set via command line diff --git a/tests/cases/compiler/pathMappingBasedModuleResolution4_classic.ts b/tests/cases/compiler/pathMappingBasedModuleResolution4_classic.ts index fbf11e61716..06028086fc5 100644 --- a/tests/cases/compiler/pathMappingBasedModuleResolution4_classic.ts +++ b/tests/cases/compiler/pathMappingBasedModuleResolution4_classic.ts @@ -4,11 +4,12 @@ // baseUrl set via command line -// @filename: c:/root/tsconfig.json -{ - "compilerOptions": { - "baseUrl": "." - } +// @filename: c:/root/tsconfig.json +{ + "compilerOptions": { + "baseUrl": ".", + "ignoreDeprecations": "6.0" + } } // @filename: c:/root/folder1/file1.ts