diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 22ac200a0dc..b1850081c7f 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1539,7 +1539,6 @@ "category": "Error", "code": 1464 }, - "The 'import.meta' meta-property is not allowed in files which will build into CommonJS output.": { "category": "Error", "code": 1470 @@ -1849,7 +1848,6 @@ "category": "Error", "code": 1546 }, - "The types of '{0}' are incompatible between these types.": { "category": "Error", "code": 2200 @@ -1890,7 +1888,6 @@ "category": "Error", "code": 2208 }, - "The project root is ambiguous, but is required to resolve export map entry '{0}' in file '{1}'. Supply the `rootDir` compiler option to disambiguate.": { "category": "Error", "code": 2209 @@ -1907,7 +1904,6 @@ "category": "Message", "code": 2212 }, - "Duplicate identifier '{0}'.": { "category": "Error", "code": 2300 @@ -2888,7 +2884,6 @@ "category": "Error", "code": 2568 }, - "Could not find name '{0}'. Did you mean '{1}'?": { "category": "Error", "code": 2570 @@ -3129,7 +3124,6 @@ "category": "Error", "code": 2639 }, - "Cannot augment module '{0}' with value exports because it resolves to a non-module entity.": { "category": "Error", "code": 2649 @@ -4007,7 +4001,6 @@ "category": "Error", "code": 2881 }, - "Import declaration '{0}' is using private name '{1}'.": { "category": "Error", "code": 4000 @@ -4452,7 +4445,6 @@ "category": "Error", "code": 4128 }, - "The current host does not support the '{0}' option.": { "category": "Error", "code": 5001 @@ -4465,6 +4457,10 @@ "category": "Error", "code": 5010 }, + "Inferred common source directory differs from tsconfig directory, output layout will be changed.": { + "category": "Error", + "code": 5011 + }, "Cannot read file '{0}': {1}.": { "category": "Error", "code": 5012 @@ -4717,7 +4713,10 @@ "category": "Error", "code": 5110 }, - + "Visit https://aka.ms/ts6 for migration information.": { + "category": "Message", + "code": 5111 + }, "Generates a sourcemap for each corresponding '.d.ts' file.": { "category": "Message", "code": 6000 @@ -5661,7 +5660,6 @@ "category": "Error", "code": 6266 }, - "Directory '{0}' has no containing package.json scope. Imports will not resolve.": { "category": "Message", "code": 6270 @@ -5754,7 +5752,6 @@ "category": "Message", "code": 6294 }, - "Enable project compilation": { "category": "Message", "code": 6302 @@ -6037,7 +6034,6 @@ "category": "Message", "code": 6421 }, - "The expected type comes from property '{0}' which is declared here on type '{1}'": { "category": "Message", "code": 6500 @@ -6562,7 +6558,6 @@ "category": "Message", "code": 6808 }, - "one of:": { "category": "Message", "code": 6900 @@ -6691,7 +6686,6 @@ "category": "Error", "code": 6931 }, - "Variable '{0}' implicitly has an '{1}' type.": { "category": "Error", "code": 7005 @@ -6914,7 +6908,6 @@ "category": "Error", "code": 7061 }, - "You cannot rename this element.": { "category": "Error", "code": 8000 @@ -7059,7 +7052,6 @@ "category": "Error", "code": 8039 }, - "Declaration emit for this file requires using private name '{0}'. An explicit type annotation may unblock declaration emit.": { "category": "Error", "code": 9005 @@ -7292,7 +7284,6 @@ "category": "Error", "code": 18003 }, - "File is a CommonJS module; it may be converted to an ES module.": { "category": "Suggestion", "code": 80001 @@ -7333,7 +7324,6 @@ "category": "Suggestion", "code": 80010 }, - "Add missing 'super()' call": { "category": "Message", "code": 90001 @@ -7554,7 +7544,6 @@ "category": "Message", "code": 90071 }, - "Convert function to an ES2015 class": { "category": "Message", "code": 95001 @@ -8323,7 +8312,6 @@ "category": "Message", "code": 95197 }, - "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer.": { "category": "Error", "code": 18004 @@ -8520,4 +8508,4 @@ "category": "Error", "code": 18061 } -} +} \ No newline at end of file diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 4db55d865d7..03952ee1423 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -664,6 +664,23 @@ export function getCommonSourceDirectory( return commonSourceDirectory; } +/** @internal */ +export function getComputedCommonSourceDirectory( + emittedFiles: readonly string[], + currentDirectory: string, + getCanonicalFileName: GetCanonicalFileName, +): string { + let commonSourceDirectory = computeCommonSourceDirectoryOfFilenames(emittedFiles, currentDirectory, getCanonicalFileName); + + if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== directorySeparator) { + // Make sure directory path ends with directory separator so this string can directly + // used to replace with "" to get the relative path of the source file and the relative path doesn't + // start with / making it rooted path + commonSourceDirectory += directorySeparator; + } + return commonSourceDirectory; +} + /** @internal */ export function getCommonSourceDirectoryOfConfig({ options, fileNames }: ParsedCommandLine, ignoreCase: boolean): string { return getCommonSourceDirectory( diff --git a/src/compiler/program.ts b/src/compiler/program.ts index bdfb8d0151b..023930d473e 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -111,6 +111,7 @@ import { GetCanonicalFileName, getCommonSourceDirectory as ts_getCommonSourceDirectory, getCommonSourceDirectoryOfConfig, + getComputedCommonSourceDirectory, getDeclarationDiagnostics as ts_getDeclarationDiagnostics, getDefaultLibFileName, getDirectoryPath, @@ -4293,6 +4294,27 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro } } + if ( + !options.noEmit && + !options.composite && + !options.rootDir && + options.configFilePath && + (options.outDir || // there is --outDir specified + (getEmitDeclarations(options) && options.declarationDir)) // there is --declarationDir specified + ) { + // Check if rootDir inferred changed and issue diagnostic + const dir = getCommonSourceDirectory(); + const emittedFiles = mapDefined(files, file => !file.isDeclarationFile && sourceFileMayBeEmitted(file, program) ? file.fileName : undefined); + const dir59 = getComputedCommonSourceDirectory(emittedFiles, currentDirectory, getCanonicalFileName); + if (dir59 !== "" && getCanonicalFileName(dir) !== getCanonicalFileName(dir59)) { + // change in layout + programDiagnostics.addConfigDiagnostic(createCompilerDiagnosticFromMessageChain(chainDiagnosticMessages( + chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Visit_https_Colon_Slash_Slashaka_ms_Slashts6_for_migration_information), + Diagnostics.Inferred_common_source_directory_differs_from_tsconfig_directory_output_layout_will_be_changed, + ))); + } + } + if (options.checkJs && !getAllowJSCompilerOption(options)) { createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "checkJs", "allowJs"); } diff --git a/tests/baselines/reference/commonSourceDirectory.js b/tests/baselines/reference/commonSourceDirectory.js index 126ffe0183d..5732ecb043c 100644 --- a/tests/baselines/reference/commonSourceDirectory.js +++ b/tests/baselines/reference/commonSourceDirectory.js @@ -27,3 +27,35 @@ foo_1.x + bar_1.y; //// [/app/bin/index.d.ts] /// export {}; + + +//// [DtsFileErrors] + + +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + + +!!! error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. +!!! error TS5011: Visit https://aka.ms/ts6 for migration information. +==== /app/tsconfig.json (0 errors) ==== + { + "compilerOptions": { + "outDir": "bin", + "typeRoots": ["../types"], + "sourceMap": true, + "mapRoot": "myMapRoot", + "sourceRoot": "mySourceRoot", + "declaration": true + } + } + +==== /app/bin/index.d.ts (0 errors) ==== + /// + export {}; + +==== /types/bar.d.ts (0 errors) ==== + declare module "bar" { + export const y = 0; + } + \ No newline at end of file diff --git a/tests/baselines/reference/commonSourceDirectory_dts.errors.txt b/tests/baselines/reference/commonSourceDirectory_dts.errors.txt new file mode 100644 index 00000000000..65f5d3717b8 --- /dev/null +++ b/tests/baselines/reference/commonSourceDirectory_dts.errors.txt @@ -0,0 +1,24 @@ +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + + +!!! error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. +!!! error TS5011: Visit https://aka.ms/ts6 for migration information. +==== /app/tsconfig.json (0 errors) ==== + { + "compilerOptions": { + "outDir": "bin", + "sourceMap": true, + "mapRoot": "myMapRoot", + "sourceRoot": "mySourceRoot", + "declaration": true + } + } + +==== /app/lib/bar.d.ts (0 errors) ==== + declare const y: number; + +==== /app/src/index.ts (0 errors) ==== + /// + export const x = y; + \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmitMonorepoBaseUrl.errors.txt b/tests/baselines/reference/declarationEmitMonorepoBaseUrl.errors.txt new file mode 100644 index 00000000000..d86f945b3b7 --- /dev/null +++ b/tests/baselines/reference/declarationEmitMonorepoBaseUrl.errors.txt @@ -0,0 +1,58 @@ +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + + +!!! error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. +!!! error TS5011: Visit https://aka.ms/ts6 for migration information. +==== /tsconfig.json (0 errors) ==== + { + "compilerOptions": { + "module": "nodenext", + "declaration": true, + "outDir": "temp", + "baseUrl": "." + } + } + +==== /packages/compiler-core/src/index.ts (0 errors) ==== + import { PluginConfig } from "@babel/parser"; + +==== /packages/compiler-sfc/src/index.ts (0 errors) ==== + import { createPlugin } from "@babel/parser"; + export function resolveParserPlugins() { + return [createPlugin()]; + } + +==== /node_modules/.pnpm/@babel+parser@7.23.6/node_modules/@babel/parser/package.json (0 errors) ==== + { + "name": "@babel/parser", + "version": "7.23.6", + "main": "./lib/index.js", + "types": "./typings/babel-parser.d.ts" + } + +==== /node_modules/.pnpm/@babel+parser@7.23.6/node_modules/@babel/parser/typings/babel-parser.d.ts (0 errors) ==== + export declare function createPlugin(): PluginConfig; + export declare class PluginConfig {} + +==== /packages/compiler-core/package.json (0 errors) ==== + { + "name": "@vue/compiler-core", + "version": "3.0.0", + "main": "./src/index.ts", + "dependencies": { + "@babel/parser": "^7.0.0" + } + } + +==== /packages/compiler-sfc/package.json (0 errors) ==== + { + "name": "@vue/compiler-sfc", + "version": "3.0.0", + "main": "./src/index.ts", + "dependencies": { + "@babel/parser": "^7.0.0", + "@vue/compiler-core": "^3.0.0" + } + } + \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmitPathMappingMonorepo.errors.txt b/tests/baselines/reference/declarationEmitPathMappingMonorepo.errors.txt new file mode 100644 index 00000000000..6219342ac70 --- /dev/null +++ b/tests/baselines/reference/declarationEmitPathMappingMonorepo.errors.txt @@ -0,0 +1,33 @@ +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + + +!!! error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. +!!! error TS5011: Visit https://aka.ms/ts6 for migration information. +==== packages/b/tsconfig.json (0 errors) ==== + { + "compilerOptions": { + "outDir": "dist", + "declaration": true, + "baseUrl": ".", + "paths": { + "@ts-bug/a": ["../a"] + } + } + } + + +==== packages/b/src/index.ts (0 errors) ==== + import { a } from "@ts-bug/a"; + + export function b(text: string) { + return a(text); + } +==== packages/a/index.d.ts (0 errors) ==== + declare module "@ts-bug/a" { + export type AText = { + value: string; + }; + export function a(text: string): AText; + } + \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmitPathMappingMonorepo2.errors.txt b/tests/baselines/reference/declarationEmitPathMappingMonorepo2.errors.txt new file mode 100644 index 00000000000..14432b4cc2e --- /dev/null +++ b/tests/baselines/reference/declarationEmitPathMappingMonorepo2.errors.txt @@ -0,0 +1,50 @@ +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + + +!!! error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. +!!! error TS5011: Visit https://aka.ms/ts6 for migration information. +==== packages/lab/tsconfig.json (0 errors) ==== + { + "compilerOptions": { + "outDir": "dist", + "declaration": true, + "baseUrl": "../", + "paths": { + "@ts-bug/core": ["./core/src"], + "@ts-bug/core/*": ["./core/src/*"], + "@ts-bug/lab": ["./lab/src"], + "@ts-bug/lab/*": ["./lab/src/*"], + "@ts-bug/styles": ["./styles/src"], + "@ts-bug/styles/*": ["./styles/src/*"] + } + } + } +==== packages/lab/src/index.ts (0 errors) ==== + import { createSvgIcon } from "@ts-bug/core/utils"; + export default createSvgIcon("Hello", "ArrowLeft"); + +==== packages/core/src/index.d.ts (0 errors) ==== + export * from "./utils"; + export { default as SvgIcon } from "./SvgIcon"; + +==== packages/core/src/SvgIcon.d.ts (0 errors) ==== + import { StyledComponentProps } from "@ts-bug/styles"; + export interface SvgIconProps extends StyledComponentProps<"root"> { + children?: string[]; + } + export interface SomeInterface { + myProp: string; + } + declare const SvgIcon: SomeInterface; + export default SvgIcon; + +==== packages/core/src/utils.d.ts (0 errors) ==== + import SvgIcon from "./SvgIcon"; + export function createSvgIcon(path: string, displayName: string): typeof SvgIcon; + +==== packages/styles/src/index.d.ts (0 errors) ==== + export interface StyledComponentProps { + classes?: Record; + } + \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmitToDeclarationDirWithDeclarationOption.js b/tests/baselines/reference/declarationEmitToDeclarationDirWithDeclarationOption.js index 0a0189ac4c6..0376969b194 100644 --- a/tests/baselines/reference/declarationEmitToDeclarationDirWithDeclarationOption.js +++ b/tests/baselines/reference/declarationEmitToDeclarationDirWithDeclarationOption.js @@ -17,3 +17,19 @@ interface Foo { x: number; } export default Foo; + + +//// [DtsFileErrors] + + +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + + +!!! error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. +!!! error TS5011: Visit https://aka.ms/ts6 for migration information. +==== /foo/tsconfig.json (0 errors) ==== + { + "compilerOptions": { "declaration": true, "declarationDir": "out" } + } + \ No newline at end of file diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt index cf0d101e887..f40d7864589 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt @@ -1,8 +1,12 @@ +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. error TS5055: Cannot write file '/bar.js' because it would overwrite input file. /root/a.ts(1,21): error TS6059: File '/foo.ts' is not under 'rootDir' '/root'. 'rootDir' is expected to contain all source files. /root/a.ts(2,21): error TS6059: File '/bar.js' is not under 'rootDir' '/root'. 'rootDir' is expected to contain all source files. +!!! error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. +!!! error TS5011: Visit https://aka.ms/ts6 for migration information. !!! error TS5055: Cannot write file '/bar.js' because it would overwrite input file. ==== /root/tsconfig.json (0 errors) ==== { diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt index a603413ee4a..321e56c24c2 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt +++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt @@ -1,8 +1,12 @@ +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. error TS5055: Cannot write file '/bar.js' because it would overwrite input file. /root/a.ts(1,21): error TS6059: File '/foo.ts' is not under 'rootDir' '/root'. 'rootDir' is expected to contain all source files. /root/a.ts(2,21): error TS6059: File '/bar.js' is not under 'rootDir' '/root'. 'rootDir' is expected to contain all source files. +!!! error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. +!!! error TS5011: Visit https://aka.ms/ts6 for migration information. !!! error TS5055: Cannot write file '/bar.js' because it would overwrite input file. ==== /root/tsconfig.json (0 errors) ==== { diff --git a/tests/baselines/reference/tsbuild/outputPaths/when-rootDir-is-not-specified.js b/tests/baselines/reference/tsbuild/outputPaths/when-rootDir-is-not-specified.js index 26e717ebda2..d5c7ffc8899 100644 --- a/tests/baselines/reference/tsbuild/outputPaths/when-rootDir-is-not-specified.js +++ b/tests/baselines/reference/tsbuild/outputPaths/when-rootDir-is-not-specified.js @@ -35,6 +35,12 @@ Output:: [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'... +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + + +Found 1 error. + //// [/home/src/workspaces/project/dist/src/index.js] @@ -45,19 +51,20 @@ exports.x = 10; //// [/home/src/workspaces/project/dist/tsconfig.tsbuildinfo] -{"root":["../src/index.ts"],"version":"FakeTSVersion"} +{"root":["../src/index.ts"],"errors":true,"version":"FakeTSVersion"} //// [/home/src/workspaces/project/dist/tsconfig.tsbuildinfo.readable.baseline.txt] { "root": [ "../src/index.ts" ], + "errors": true, "version": "FakeTSVersion", - "size": 54 + "size": 68 } -exitCode:: ExitStatus.Success +exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped Change:: no-change-run @@ -68,12 +75,23 @@ Output:: [HH:MM:SS AM] Projects in this build: * tsconfig.json -[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/index.ts' is older than output 'dist/src/index.js' +[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file 'dist/tsconfig.tsbuildinfo' indicates that program needs to report errors. + +[HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'... + +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + + +Found 1 error. +//// [/home/src/workspaces/project/dist/src/index.js] file written with same contents +//// [/home/src/workspaces/project/dist/tsconfig.tsbuildinfo] file written with same contents +//// [/home/src/workspaces/project/dist/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents -exitCode:: ExitStatus.Success +exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped Change:: Normal build without change, that does not block emit on error to show files that get emitted @@ -81,8 +99,14 @@ Input:: /home/src/tslibs/TS/Lib/tsc.js -p /home/src/workspaces/project/tsconfig.json Output:: +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + + +Found 1 error. + //// [/home/src/workspaces/project/dist/src/index.js] file written with same contents -exitCode:: ExitStatus.Success +exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/files-containing-json-file-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/files-containing-json-file-non-composite.js index 9fab5ee5817..6a7404f8652 100644 --- a/tests/baselines/reference/tsbuild/resolveJsonModule/files-containing-json-file-non-composite.js +++ b/tests/baselines/reference/tsbuild/resolveJsonModule/files-containing-json-file-non-composite.js @@ -52,6 +52,9 @@ Output:: [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'... +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + project/tsconfig.json:3:25 - error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. 3 "moduleResolution": "node", @@ -68,7 +71,7 @@ project/src/hello.json project/src/index.ts Part of 'files' list in tsconfig.json -Found 1 error. +Found 2 errors. diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-and-files-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-and-files-non-composite.js index ed24eb8eb12..569ab0aae9b 100644 --- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-and-files-non-composite.js +++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-and-files-non-composite.js @@ -54,6 +54,9 @@ Output:: [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'... +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + project/tsconfig.json:3:25 - error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. 3 "moduleResolution": "node", @@ -70,7 +73,7 @@ project/src/hello.json project/src/index.ts Matched by include pattern 'src/**/*' in 'project/tsconfig.json' -Found 1 error. +Found 2 errors. diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-and-file-name-matches-ts-file-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-and-file-name-matches-ts-file-non-composite.js index bf9ca97a655..799f4eea6bd 100644 --- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-and-file-name-matches-ts-file-non-composite.js +++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-and-file-name-matches-ts-file-non-composite.js @@ -52,6 +52,9 @@ Output:: [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'... +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + project/tsconfig.json:3:25 - error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. 3 "moduleResolution": "node", @@ -68,7 +71,7 @@ project/src/index.json project/src/index.ts Matched by include pattern 'src/**/*' in 'project/tsconfig.json' -Found 1 error. +Found 2 errors. diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-non-composite.js index d584ac13d67..bc013b992dc 100644 --- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-non-composite.js +++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-non-composite.js @@ -52,6 +52,9 @@ Output:: [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'... +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + project/tsconfig.json:3:25 - error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. 3 "moduleResolution": "node", @@ -68,7 +71,7 @@ project/src/hello.json project/src/index.ts Matched by include pattern 'src/**/*' in 'project/tsconfig.json' -Found 1 error. +Found 2 errors. diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-non-composite.js index 71245219d20..5970f97d884 100644 --- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-non-composite.js +++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-non-composite.js @@ -51,6 +51,9 @@ Output:: [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'... +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + project/tsconfig.json:3:25 - error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. 3 "moduleResolution": "node", @@ -66,7 +69,7 @@ project/src/hello.json project/src/index.ts Matched by include pattern 'src/**/*' in 'project/tsconfig.json' -Found 1 error. +Found 2 errors. diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-without-rootDir-but-outside-configDirectory-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-without-rootDir-but-outside-configDirectory-non-composite.js index c34d3b05f08..9b7483f7aab 100644 --- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-without-rootDir-but-outside-configDirectory-non-composite.js +++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-without-rootDir-but-outside-configDirectory-non-composite.js @@ -51,6 +51,9 @@ Output:: [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'... +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + project/tsconfig.json:3:25 - error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. 3 "moduleResolution": "node", @@ -65,7 +68,7 @@ hello.json project/src/index.ts Matched by include pattern 'src/**/*' in 'project/tsconfig.json' -Found 1 error. +Found 2 errors. diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap-non-composite.js index ef7f77c0cc4..d5fea1bea65 100644 --- a/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap-non-composite.js +++ b/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap-non-composite.js @@ -53,6 +53,9 @@ Output:: [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'... +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + project/tsconfig.json:3:25 - error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. 3 "moduleResolution": "node", @@ -70,7 +73,7 @@ project/src/hello.json project/src/index.ts Part of 'files' list in tsconfig.json -Found 1 error. +Found 2 errors. @@ -123,6 +126,9 @@ Output:: [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'... +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + project/tsconfig.json:3:25 - error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. 3 "moduleResolution": "node", @@ -140,7 +146,7 @@ project/src/hello.json project/src/index.ts Part of 'files' list in tsconfig.json -Found 1 error. +Found 2 errors. diff --git a/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js b/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js index 20e0d64f0c1..53693a66ce7 100644 --- a/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js +++ b/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js @@ -96,6 +96,9 @@ declare const console: { log(msg: any): void; }; D:\home\src\tslibs\TS\Lib\tsc.js -p D:\Work\pkg1 --explainFiles Output:: +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + tsconfig.json:21:25 - error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. 21 "moduleResolution": "node", @@ -112,7 +115,7 @@ src/utils/index.ts src/main.ts Matched by include pattern 'src' in 'tsconfig.json' -Found 1 error in tsconfig.json:21 +Found 2 errors in the same file, starting at: tsconfig.json:21 diff --git a/tests/baselines/reference/tsc/moduleResolution/pnpm-style-layout.js b/tests/baselines/reference/tsc/moduleResolution/pnpm-style-layout.js index 9d931dab8c9..4305607e68f 100644 --- a/tests/baselines/reference/tsc/moduleResolution/pnpm-style-layout.js +++ b/tests/baselines/reference/tsc/moduleResolution/pnpm-style-layout.js @@ -331,6 +331,9 @@ Directory '/home/src/node_modules' does not exist, skipping all lookups in it. Directory '/home/node_modules' does not exist, skipping all lookups in it. Directory '/node_modules' does not exist, skipping all lookups in it. ======== Module name '@typescript/lib-es5' was not resolved. ======== +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + tsconfig.json:8:25 - error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. 8 "moduleResolution": "node", @@ -352,7 +355,7 @@ Directory '/node_modules' does not exist, skipping all lookups in it. src/app.tsx Matched by include pattern 'src' in 'tsconfig.json' -Found 1 error in tsconfig.json:8 +Found 2 errors in the same file, starting at: tsconfig.json:8 diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/without---outFile-and-multiple-declaration-files-in-the-program.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/without---outFile-and-multiple-declaration-files-in-the-program.js index 8006b392c1f..c081ce944a7 100644 --- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/without---outFile-and-multiple-declaration-files-in-the-program.js +++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/without---outFile-and-multiple-declaration-files-in-the-program.js @@ -47,10 +47,8 @@ Output:: >> Screen clear [HH:MM:SS AM] Starting compilation in watch mode... -src/main2.ts:1:114 - error TS2724: 'Common.SomeComponent.DynamicMenu' has no exported member named 'z'. Did you mean 'Z'? - -1 namespace main.file4 { import DynamicMenu = Common.SomeComponent.DynamicMenu; export function foo(a: DynamicMenu.z) { } } -   ~ +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. [HH:MM:SS AM] Found 1 error. Watching for file changes. @@ -120,12 +118,7 @@ Program files:: /home/src/projects/a/b/project/src/main.ts /home/src/projects/a/b/project/src/main2.ts -Semantic diagnostics in builder refreshed for:: -/home/src/tslibs/TS/Lib/lib.d.ts -/home/src/projects/a/b/output/AnotherDependency/file1.d.ts -/home/src/projects/a/b/dependencies/file2.d.ts -/home/src/projects/a/b/project/src/main.ts -/home/src/projects/a/b/project/src/main2.ts +No cached semantic diagnostics in the builder:: Shape signatures in builder refreshed for:: /home/src/tslibs/ts/lib/lib.d.ts (used version) diff --git a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js index a7b26ccd9a8..092880efac6 100644 --- a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js +++ b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js @@ -39,7 +39,10 @@ Output:: >> Screen clear [HH:MM:SS AM] Starting compilation in watch mode... -[HH:MM:SS AM] Found 0 errors. Watching for file changes. +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + +[HH:MM:SS AM] Found 1 error. Watching for file changes. @@ -93,10 +96,7 @@ Program files:: /home/src/projects/a/rootFolder/project/Scripts/Javascript.js /home/src/projects/a/rootFolder/project/Scripts/TypeScript.ts -Semantic diagnostics in builder refreshed for:: -/home/src/tslibs/TS/Lib/lib.d.ts -/home/src/projects/a/rootFolder/project/Scripts/Javascript.js -/home/src/projects/a/rootFolder/project/Scripts/TypeScript.ts +No cached semantic diagnostics in the builder:: Shape signatures in builder refreshed for:: /home/src/tslibs/ts/lib/lib.d.ts (used version) @@ -124,7 +124,10 @@ Output:: >> Screen clear [HH:MM:SS AM] File change detected. Starting incremental compilation... -[HH:MM:SS AM] Found 0 errors. Watching for file changes. +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + +[HH:MM:SS AM] Found 1 error. Watching for file changes. @@ -152,10 +155,7 @@ Program files:: /home/src/projects/a/rootFolder/project/Scripts/Javascript.js /home/src/projects/a/rootFolder/project/Scripts/TypeScript.ts -Semantic diagnostics in builder refreshed for:: -/home/src/tslibs/TS/Lib/lib.d.ts -/home/src/projects/a/rootFolder/project/Scripts/Javascript.js -/home/src/projects/a/rootFolder/project/Scripts/TypeScript.ts +No cached semantic diagnostics in the builder:: Shape signatures in builder refreshed for:: /home/src/projects/a/rootfolder/project/scripts/typescript.ts (computed .d.ts) diff --git a/tests/baselines/reference/tscWatch/nodeNextWatch/esm-mode-file-is-edited.js b/tests/baselines/reference/tscWatch/nodeNextWatch/esm-mode-file-is-edited.js index e26e547c8d8..2ee37800ba2 100644 --- a/tests/baselines/reference/tscWatch/nodeNextWatch/esm-mode-file-is-edited.js +++ b/tests/baselines/reference/tscWatch/nodeNextWatch/esm-mode-file-is-edited.js @@ -49,7 +49,10 @@ Output:: >> Screen clear [HH:MM:SS AM] Starting compilation in watch mode... -[HH:MM:SS AM] Found 0 errors. Watching for file changes. +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + +[HH:MM:SS AM] Found 1 error. Watching for file changes. @@ -116,10 +119,7 @@ Program files:: /home/src/projects/project/src/deps.d.ts /home/src/projects/project/src/index.ts -Semantic diagnostics in builder refreshed for:: -/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts -/home/src/projects/project/src/deps.d.ts -/home/src/projects/project/src/index.ts +No cached semantic diagnostics in the builder:: Shape signatures in builder refreshed for:: /home/src/tslibs/ts/lib/lib.es2020.full.d.ts (used version) @@ -148,7 +148,10 @@ Output:: >> Screen clear [HH:MM:SS AM] File change detected. Starting incremental compilation... -[HH:MM:SS AM] Found 0 errors. Watching for file changes. +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + +[HH:MM:SS AM] Found 1 error. Watching for file changes. @@ -174,8 +177,7 @@ Program files:: /home/src/projects/project/src/deps.d.ts /home/src/projects/project/src/index.ts -Semantic diagnostics in builder refreshed for:: -/home/src/projects/project/src/index.ts +No cached semantic diagnostics in the builder:: Shape signatures in builder refreshed for:: /home/src/projects/project/src/index.ts (computed .d.ts) diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js index 56e39a0b54a..391407cccdf 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js @@ -34,7 +34,10 @@ Output:: >> Screen clear [HH:MM:SS AM] Starting compilation in watch mode... -[HH:MM:SS AM] Found 0 errors. Watching for file changes. +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + +[HH:MM:SS AM] Found 1 error. Watching for file changes. @@ -90,10 +93,7 @@ Program files:: /user/username/projects/myproject/src/file2.ts /user/username/projects/myproject/src/file1.ts -Semantic diagnostics in builder refreshed for:: -/home/src/tslibs/TS/Lib/lib.d.ts -/user/username/projects/myproject/src/file2.ts -/user/username/projects/myproject/src/file1.ts +No cached semantic diagnostics in the builder:: Shape signatures in builder refreshed for:: /home/src/tslibs/ts/lib/lib.d.ts (used version) @@ -163,11 +163,14 @@ Output:: >> Screen clear [HH:MM:SS AM] File change detected. Starting incremental compilation... +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + error TS6053: File '/user/username/projects/myproject/src/file2.ts' not found. The file is in the program because: Matched by default include pattern '**/*' -[HH:MM:SS AM] Found 1 error. Watching for file changes. +[HH:MM:SS AM] Found 2 errors. Watching for file changes. @@ -216,8 +219,7 @@ Program files:: /home/src/tslibs/TS/Lib/lib.d.ts /user/username/projects/myproject/src/file1.ts -Semantic diagnostics in builder refreshed for:: -/user/username/projects/myproject/src/file1.ts +No cached semantic diagnostics in the builder:: Shape signatures in builder refreshed for:: /user/username/projects/myproject/src/file1.ts (computed .d.ts) @@ -247,10 +249,8 @@ Output:: >> Screen clear [HH:MM:SS AM] File change detected. Starting incremental compilation... -src/file1.ts:1:19 - error TS2307: Cannot find module './file2' or its corresponding type declarations. - -1 import { x } from "./file2"; -   ~~~~~~~~~ +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. [HH:MM:SS AM] Found 1 error. Watching for file changes. @@ -317,9 +317,7 @@ Program files:: /user/username/projects/myproject/src/file1.ts /user/username/projects/myproject/src/renamed.ts -Semantic diagnostics in builder refreshed for:: -/user/username/projects/myproject/src/file1.ts -/user/username/projects/myproject/src/renamed.ts +No cached semantic diagnostics in the builder:: Shape signatures in builder refreshed for:: /user/username/projects/myproject/src/renamed.ts (computed .d.ts) diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js index 0b0bcd0a8ae..e80be524981 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js @@ -35,7 +35,10 @@ Output:: >> Screen clear [HH:MM:SS AM] Starting compilation in watch mode... -[HH:MM:SS AM] Found 0 errors. Watching for file changes. +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + +[HH:MM:SS AM] Found 1 error. Watching for file changes. @@ -102,10 +105,7 @@ Program files:: /user/username/projects/myproject/node_modules/file2/index.d.ts /user/username/projects/myproject/src/file1.ts -Semantic diagnostics in builder refreshed for:: -/home/src/tslibs/TS/Lib/lib.d.ts -/user/username/projects/myproject/node_modules/file2/index.d.ts -/user/username/projects/myproject/src/file1.ts +No cached semantic diagnostics in the builder:: Shape signatures in builder refreshed for:: /home/src/tslibs/ts/lib/lib.d.ts (used version) @@ -158,7 +158,10 @@ Output:: >> Screen clear [HH:MM:SS AM] File change detected. Starting incremental compilation... -[HH:MM:SS AM] Found 0 errors. Watching for file changes. +error TS5011: Inferred common source directory differs from tsconfig directory, output layout will be changed. + Visit https://aka.ms/ts6 for migration information. + +[HH:MM:SS AM] Found 1 error. Watching for file changes. @@ -235,8 +238,7 @@ Program files:: /user/username/projects/myproject/src/file1.ts /user/username/projects/myproject/src/file3.ts -Semantic diagnostics in builder refreshed for:: -/user/username/projects/myproject/src/file3.ts +No cached semantic diagnostics in the builder:: Shape signatures in builder refreshed for:: /user/username/projects/myproject/src/file3.ts (computed .d.ts) diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js index 2ae2b214acd..24a0b72ffc7 100644 --- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js +++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js @@ -272,6 +272,11 @@ Info seq [hh:mm:ss:mss] event: } ] }, + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + }, { "start": { "line": 7, diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js index 981c65f403c..f54edb5e76d 100644 --- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js +++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js @@ -272,6 +272,11 @@ Info seq [hh:mm:ss:mss] event: } ] }, + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + }, { "start": { "line": 7, diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-first-indirect-project-but-not-in-another-one.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-first-indirect-project-but-not-in-another-one.js index f2412f04852..54375938cc6 100644 --- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-first-indirect-project-but-not-in-another-one.js +++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-first-indirect-project-but-not-in-another-one.js @@ -340,7 +340,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/src/main.ts", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-src.json, currentDirectory: /user/username/projects/myproject @@ -1287,7 +1293,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/src/main.ts", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-src.json, currentDirectory: /user/username/projects/myproject @@ -1599,7 +1611,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/tsconfig.json", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig-src.json WatchType: Type roots diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-indirect-project.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-indirect-project.js index 1e889104300..d66f80849b7 100644 --- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-indirect-project.js +++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-indirect-project.js @@ -293,7 +293,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/src/main.ts", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/tsconfig.json ProjectRootPath: undefined:: Result: undefined @@ -1030,7 +1036,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/src/main.ts", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/tsconfig.json ProjectRootPath: undefined:: Result: undefined @@ -1254,7 +1266,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/tsconfig.json", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/tsconfig.json ProjectRootPath: undefined:: Result: undefined diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set.js index d3dbabf2286..7858b55c667 100644 --- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set.js +++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set.js @@ -251,7 +251,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/src/main.ts", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/tsconfig.json ProjectRootPath: undefined:: Result: undefined @@ -918,7 +924,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/src/main.ts", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/tsconfig.json ProjectRootPath: undefined:: Result: undefined @@ -1112,7 +1124,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/tsconfig.json", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/tsconfig.json ProjectRootPath: undefined:: Result: undefined diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-found-is-not-solution-but-references-open-file-through-project-reference.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-found-is-not-solution-but-references-open-file-through-project-reference.js index 4b57bc630c4..31250b6c447 100644 --- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-found-is-not-solution-but-references-open-file-through-project-reference.js +++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-found-is-not-solution-but-references-open-file-through-project-reference.js @@ -248,7 +248,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/src/main.ts", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-src.json, currentDirectory: /user/username/projects/myproject @@ -1179,7 +1185,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/src/main.ts", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-src.json, currentDirectory: /user/username/projects/myproject @@ -1732,32 +1744,6 @@ Info seq [hh:mm:ss:mss] Files (4) /user/username/projects/myproject/own/main.ts Text-2 "import { foo } from 'main';\nfoo;\nexport function bar() {}" Info seq [hh:mm:ss:mss] ----------------------------------------------- -Info seq [hh:mm:ss:mss] event: - { - "seq": 0, - "type": "event", - "event": "configFileDiag", - "body": { - "triggerFile": "/user/username/projects/myproject/tsconfig.json", - "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [ - { - "start": { - "line": 7, - "offset": 5 - }, - "end": { - "line": 9, - "offset": 6 - }, - "text": "File '/user/username/projects/myproject/tsconfig-src.json' not found.", - "code": 6053, - "category": "error", - "fileName": "/user/username/projects/myproject/tsconfig.json" - } - ] - } - } Info seq [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles* Info seq [hh:mm:ss:mss] Before ensureProjectForOpenFiles: Info seq [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured) @@ -1954,17 +1940,6 @@ Info seq [hh:mm:ss:mss] Files (4) /user/username/projects/myproject/own/main.ts Text-2 "import { foo } from 'main';\nfoo;\nexport function bar() {}" Info seq [hh:mm:ss:mss] ----------------------------------------------- -Info seq [hh:mm:ss:mss] event: - { - "seq": 0, - "type": "event", - "event": "configFileDiag", - "body": { - "triggerFile": "/user/username/projects/myproject/tsconfig.json", - "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] - } - } Info seq [hh:mm:ss:mss] Running: /user/username/projects/myproject/tsconfig-src.json Info seq [hh:mm:ss:mss] event: { @@ -2521,7 +2496,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/tsconfig.json", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig-src.json WatchType: Type roots @@ -3644,7 +3625,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/tsconfig.json", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-src.json, currentDirectory: /user/username/projects/myproject diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-is-indirectly-referenced-by-solution.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-is-indirectly-referenced-by-solution.js index 40018546cfc..46545231935 100644 --- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-is-indirectly-referenced-by-solution.js +++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-is-indirectly-referenced-by-solution.js @@ -338,7 +338,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/src/main.ts", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-src.json, currentDirectory: /user/username/projects/myproject @@ -1373,7 +1379,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/src/main.ts", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-src.json, currentDirectory: /user/username/projects/myproject @@ -2285,7 +2297,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/tsconfig.json", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] Running: /user/username/projects/myproject/tsconfig-src.json @@ -2946,7 +2964,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/tsconfig.json", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig-src.json WatchType: Type roots @@ -4600,7 +4624,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/tsconfig.json", "configFile": "/user/username/projects/myproject/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-src.json, currentDirectory: /user/username/projects/myproject diff --git a/tests/baselines/reference/tsserver/projectReferences/when-file-is-not-part-of-first-config-tree-found-demoConfig-change-with-file-open-before-revert.js b/tests/baselines/reference/tsserver/projectReferences/when-file-is-not-part-of-first-config-tree-found-demoConfig-change-with-file-open-before-revert.js index 111dfc3f190..75e631a419b 100644 --- a/tests/baselines/reference/tsserver/projectReferences/when-file-is-not-part-of-first-config-tree-found-demoConfig-change-with-file-open-before-revert.js +++ b/tests/baselines/reference/tsserver/projectReferences/when-file-is-not-part-of-first-config-tree-found-demoConfig-change-with-file-open-before-revert.js @@ -546,6 +546,23 @@ Info seq [hh:mm:ss:mss] Files (4) /home/src/projects/project/demos/helpers.ts Text-1 "export const foo = 1;\n" Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "configFileDiag", + "body": { + "triggerFile": "/home/src/projects/project/tsconfig.json", + "configFile": "/home/src/projects/project/tsconfig.json", + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] + } + } Info seq [hh:mm:ss:mss] Running: /home/src/projects/project/demos/tsconfig.json Info seq [hh:mm:ss:mss] event: { @@ -1232,6 +1249,17 @@ Info seq [hh:mm:ss:mss] Files (4) /home/src/projects/project/app/Component.ts Text-1 "export const Component = () => {}\n" Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "configFileDiag", + "body": { + "triggerFile": "/home/src/projects/project/tsconfig.json", + "configFile": "/home/src/projects/project/tsconfig.json", + "diagnostics": [] + } + } Info seq [hh:mm:ss:mss] Running: /home/src/projects/project/demos/tsconfig.json Info seq [hh:mm:ss:mss] event: { diff --git a/tests/baselines/reference/tsserver/projectReferences/when-file-is-not-part-of-first-config-tree-found-demoConfig-change.js b/tests/baselines/reference/tsserver/projectReferences/when-file-is-not-part-of-first-config-tree-found-demoConfig-change.js index cd0992a3bab..3dbea898f48 100644 --- a/tests/baselines/reference/tsserver/projectReferences/when-file-is-not-part-of-first-config-tree-found-demoConfig-change.js +++ b/tests/baselines/reference/tsserver/projectReferences/when-file-is-not-part-of-first-config-tree-found-demoConfig-change.js @@ -546,6 +546,23 @@ Info seq [hh:mm:ss:mss] Files (4) /home/src/projects/project/demos/helpers.ts Text-1 "export const foo = 1;\n" Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "configFileDiag", + "body": { + "triggerFile": "/home/src/projects/project/tsconfig.json", + "configFile": "/home/src/projects/project/tsconfig.json", + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] + } + } Info seq [hh:mm:ss:mss] Running: /home/src/projects/project/demos/tsconfig.json Info seq [hh:mm:ss:mss] event: { @@ -832,6 +849,17 @@ Info seq [hh:mm:ss:mss] Files (4) /home/src/projects/project/app/Component.ts Text-1 "export const Component = () => {}\n" Info seq [hh:mm:ss:mss] ----------------------------------------------- +Info seq [hh:mm:ss:mss] event: + { + "seq": 0, + "type": "event", + "event": "configFileDiag", + "body": { + "triggerFile": "/home/src/projects/project/tsconfig.json", + "configFile": "/home/src/projects/project/tsconfig.json", + "diagnostics": [] + } + } Info seq [hh:mm:ss:mss] Running: /home/src/projects/project/demos/tsconfig.json Info seq [hh:mm:ss:mss] event: { diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js index 148a97fcaf3..732da7523cb 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js @@ -210,7 +210,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/src/somefolder/srcfile.ts", "configFile": "/user/username/projects/myproject/src/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] Project '/user/username/projects/myproject/src/tsconfig.json' (Configured) diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js index 9b02a29a4cc..4e38a940434 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js @@ -222,7 +222,13 @@ Info seq [hh:mm:ss:mss] event: "body": { "triggerFile": "/user/username/projects/myproject/src/somefolder/srcfile.ts", "configFile": "/user/username/projects/myproject/src/tsconfig.json", - "diagnostics": [] + "diagnostics": [ + { + "text": "Inferred common source directory differs from tsconfig directory, output layout will be changed.\n Visit https://aka.ms/ts6 for migration information.", + "code": 5011, + "category": "error" + } + ] } } Info seq [hh:mm:ss:mss] Project '/user/username/projects/myproject/src/tsconfig.json' (Configured)