From d760cbb74bb63b7f8d2712ae333086857dcf952f Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 17 Jun 2019 14:27:55 -0700 Subject: [PATCH 1/4] Make any paths in buildInfoFile to be relative to it. --- src/compiler/builder.ts | 106 +++++++++--------- src/compiler/tsbuild.ts | 4 +- src/compiler/watch.ts | 8 +- .../unittests/tscWatch/incremental.ts | 93 ++++++++------- .../reference/api/tsserverlibrary.d.ts | 2 +- tests/baselines/reference/api/typescript.d.ts | 2 +- .../inferred-type-from-transitive-module.js | 44 ++++---- .../inferred-type-from-transitive-module.js | 44 ++++---- ...s-merged-and-contains-late-bound-member.js | 24 ++-- ...s-merged-and-contains-late-bound-member.js | 24 ++-- .../incremental-declaration-changes/sample.js | 82 +++++++------- .../when-declaration-option-changes.js | 16 +-- ...en-logic-config-changes-declaration-dir.js | 66 +++++------ .../when-target-option-changes.js | 20 ++-- .../sample.js | 16 +-- .../tsbuild/sample1/initial-Build/sample.js | 82 +++++++------- .../when-declaration-option-changes.js | 16 +-- ...en-logic-config-changes-declaration-dir.js | 82 +++++++------- .../when-logic-specifies-tsBuildInfoFile.js | 82 +++++++------- .../when-target-option-changes.js | 20 ++-- 20 files changed, 419 insertions(+), 414 deletions(-) diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts index d4c2132d36baa..541cc24413ff4 100644 --- a/src/compiler/builder.ts +++ b/src/compiler/builder.ts @@ -10,18 +10,13 @@ namespace ts { export interface ReusableDiagnosticRelatedInformation { category: DiagnosticCategory; code: number; - file: Path | undefined; + file: string | undefined; start: number | undefined; length: number | undefined; messageText: string | ReusableDiagnosticMessageChain; } - export interface ReusableDiagnosticMessageChain { - messageText: string; - category: DiagnosticCategory; - code: number; - next?: ReusableDiagnosticMessageChain; - } + export type ReusableDiagnosticMessageChain = DiagnosticMessageChain; export interface ReusableBuilderProgramState extends ReusableBuilderState { /** @@ -227,7 +222,7 @@ namespace ts { // Unchanged file copy diagnostics const diagnostics = oldState!.semanticDiagnosticsPerFile!.get(sourceFilePath); if (diagnostics) { - state.semanticDiagnosticsPerFile!.set(sourceFilePath, oldState!.hasReusableDiagnostic ? convertToDiagnostics(diagnostics as ReadonlyArray, newProgram) : diagnostics as ReadonlyArray); + state.semanticDiagnosticsPerFile!.set(sourceFilePath, oldState!.hasReusableDiagnostic ? convertToDiagnostics(diagnostics as ReadonlyArray, newProgram, getCanonicalFileName) : diagnostics as ReadonlyArray); if (!state.semanticDiagnosticsFromOldState) { state.semanticDiagnosticsFromOldState = createMap(); } @@ -246,37 +241,32 @@ namespace ts { return state; } - function convertToDiagnostics(diagnostics: ReadonlyArray, newProgram: Program): ReadonlyArray { + function convertToDiagnostics(diagnostics: ReadonlyArray, newProgram: Program, getCanonicalFileName: GetCanonicalFileName): ReadonlyArray { if (!diagnostics.length) return emptyArray; + const buildInfoDirectory = getDirectoryPath(getOutputPathForBuildInfo(newProgram.getCompilerOptions())!); return diagnostics.map(diagnostic => { - const result: Diagnostic = convertToDiagnosticRelatedInformation(diagnostic, newProgram); + const result: Diagnostic = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath); result.reportsUnnecessary = diagnostic.reportsUnnecessary; result.source = diagnostic.source; const { relatedInformation } = diagnostic; result.relatedInformation = relatedInformation ? relatedInformation.length ? - relatedInformation.map(r => convertToDiagnosticRelatedInformation(r, newProgram)) : + relatedInformation.map(r => convertToDiagnosticRelatedInformation(r, newProgram, toPath)) : emptyArray : undefined; return result; }); - } - function convertToDiagnosticRelatedInformation(diagnostic: ReusableDiagnosticRelatedInformation, newProgram: Program): DiagnosticRelatedInformation { - const { file, messageText } = diagnostic; - return { - ...diagnostic, - file: file && newProgram.getSourceFileByPath(file), - messageText: messageText === undefined || isString(messageText) ? - messageText : - convertToDiagnosticMessageChain(messageText, newProgram) - }; + function toPath(path: string) { + return ts.toPath(path, buildInfoDirectory, getCanonicalFileName); + } } - function convertToDiagnosticMessageChain(diagnostic: ReusableDiagnosticMessageChain, newProgram: Program): DiagnosticMessageChain { + function convertToDiagnosticRelatedInformation(diagnostic: ReusableDiagnosticRelatedInformation, newProgram: Program, toPath: (path: string) => Path): DiagnosticRelatedInformation { + const { file } = diagnostic; return { ...diagnostic, - next: diagnostic.next && convertToDiagnosticMessageChain(diagnostic.next, newProgram) + file: file ? newProgram.getSourceFileByPath(toPath(file)) : undefined }; } @@ -620,19 +610,20 @@ namespace ts { /** * Gets the program information to be emitted in buildInfo so that we can use it to create new program */ - function getProgramBuildInfo(state: Readonly): ProgramBuildInfo | undefined { + function getProgramBuildInfo(state: Readonly, getCanonicalFileName: GetCanonicalFileName): ProgramBuildInfo | undefined { if (state.compilerOptions.outFile || state.compilerOptions.out) return undefined; + const buildInfoDirectory = getDirectoryPath(getOutputPathForBuildInfo(state.compilerOptions)!); const fileInfos: MapLike = {}; state.fileInfos.forEach((value, key) => { const signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key); - fileInfos[key] = signature === undefined ? value : { version: value.version, signature }; + fileInfos[relativeToBuildInfo(key)] = signature === undefined ? value : { version: value.version, signature }; }); const result: ProgramBuildInfo = { fileInfos, options: state.compilerOptions }; if (state.referencedMap) { const referencedMap: MapLike = {}; state.referencedMap.forEach((value, key) => { - referencedMap[key] = arrayFrom(value.keys()); + referencedMap[relativeToBuildInfo(key)] = arrayFrom(value.keys(), relativeToBuildInfo); }); result.referencedMap = referencedMap; } @@ -642,9 +633,9 @@ namespace ts { state.exportedModulesMap.forEach((value, key) => { const newValue = state.currentAffectedFilesExportedModulesMap && state.currentAffectedFilesExportedModulesMap.get(key); // Not in temporary cache, use existing value - if (newValue === undefined) exportedModulesMap[key] = arrayFrom(value.keys()); + if (newValue === undefined) exportedModulesMap[relativeToBuildInfo(key)] = arrayFrom(value.keys(), relativeToBuildInfo); // Value in cache and has updated value map, use that - else if (newValue) exportedModulesMap[key] = arrayFrom(newValue.keys()); + else if (newValue) exportedModulesMap[relativeToBuildInfo(key)] = arrayFrom(newValue.keys(), relativeToBuildInfo); }); result.exportedModulesMap = exportedModulesMap; } @@ -655,50 +646,44 @@ namespace ts { state.semanticDiagnosticsPerFile.forEach((value, key) => semanticDiagnosticsPerFile.push( value.length ? [ - key, + relativeToBuildInfo(key), state.hasReusableDiagnostic ? value as ReadonlyArray : - convertToReusableDiagnostics(value as ReadonlyArray) + convertToReusableDiagnostics(value as ReadonlyArray, relativeToBuildInfo) ] : - key + relativeToBuildInfo(key) )); result.semanticDiagnosticsPerFile = semanticDiagnosticsPerFile; } return result; + + function relativeToBuildInfo(path: string) { + return ensurePathIsNonModuleName(getRelativePathFromDirectory(buildInfoDirectory, path, getCanonicalFileName)); + } } - function convertToReusableDiagnostics(diagnostics: ReadonlyArray): ReadonlyArray { + function convertToReusableDiagnostics(diagnostics: ReadonlyArray, relativeToBuildInfo: (path: string) => string): ReadonlyArray { Debug.assert(!!diagnostics.length); return diagnostics.map(diagnostic => { - const result: ReusableDiagnostic = convertToReusableDiagnosticRelatedInformation(diagnostic); + const result: ReusableDiagnostic = convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo); result.reportsUnnecessary = diagnostic.reportsUnnecessary; result.source = diagnostic.source; const { relatedInformation } = diagnostic; result.relatedInformation = relatedInformation ? relatedInformation.length ? - relatedInformation.map(r => convertToReusableDiagnosticRelatedInformation(r)) : + relatedInformation.map(r => convertToReusableDiagnosticRelatedInformation(r, relativeToBuildInfo)) : emptyArray : undefined; return result; }); } - function convertToReusableDiagnosticRelatedInformation(diagnostic: DiagnosticRelatedInformation): ReusableDiagnosticRelatedInformation { - const { file, messageText } = diagnostic; + function convertToReusableDiagnosticRelatedInformation(diagnostic: DiagnosticRelatedInformation, relativeToBuildInfo: (path: string) => string): ReusableDiagnosticRelatedInformation { + const { file } = diagnostic; return { ...diagnostic, - file: file && file.path, - messageText: messageText === undefined || isString(messageText) ? - messageText : - convertToReusableDiagnosticMessageChain(messageText) - }; - } - - function convertToReusableDiagnosticMessageChain(diagnostic: DiagnosticMessageChain): ReusableDiagnosticMessageChain { - return { - ...diagnostic, - next: diagnostic.next && convertToReusableDiagnosticMessageChain(diagnostic.next) + file: file ? relativeToBuildInfo(file.path) : undefined }; } @@ -767,7 +752,7 @@ namespace ts { const computeHash = host.createHash || generateDjb2Hash; let state = createBuilderProgramState(newProgram, getCanonicalFileName, oldState); let backupState: BuilderProgramState | undefined; - newProgram.getProgramBuildInfo = () => getProgramBuildInfo(state); + newProgram.getProgramBuildInfo = () => getProgramBuildInfo(state, getCanonicalFileName); // To ensure that we arent storing any references to old program or new program without state newProgram = undefined!; // TODO: GH#18217 @@ -980,26 +965,35 @@ namespace ts { } } - function getMapOfReferencedSet(mapLike: MapLike> | undefined): ReadonlyMap | undefined { + function getMapOfReferencedSet(mapLike: MapLike> | undefined, toPath: (path: string) => Path): ReadonlyMap | undefined { if (!mapLike) return undefined; const map = createMap(); // Copies keys/values from template. Note that for..in will not throw if // template is undefined, and instead will just exit the loop. for (const key in mapLike) { if (hasProperty(mapLike, key)) { - map.set(key, arrayToSet(mapLike[key])); + map.set(toPath(key), arrayToSet(mapLike[key], toPath)); } } return map; } - export function createBuildProgramUsingProgramBuildInfo(program: ProgramBuildInfo): EmitAndSemanticDiagnosticsBuilderProgram { - const fileInfos = createMapFromTemplate(program.fileInfos); + export function createBuildProgramUsingProgramBuildInfo(program: ProgramBuildInfo, buildInfoPath: string, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram { + const buildInfoDirectory = getDirectoryPath(buildInfoPath); + const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames); + + const fileInfos = createMap(); + for (const key in program.fileInfos) { + if (hasProperty(program.fileInfos, key)) { + fileInfos.set(toPath(key), program.fileInfos[key]); + } + } + const state: ReusableBuilderProgramState = { fileInfos, compilerOptions: program.options, - referencedMap: getMapOfReferencedSet(program.referencedMap), - exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap), + referencedMap: getMapOfReferencedSet(program.referencedMap, toPath), + exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap, toPath), semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && arrayToMap(program.semanticDiagnosticsPerFile, value => isString(value) ? value : value[0], value => isString(value) ? emptyArray : value[1]), hasReusableDiagnostic: true }; @@ -1025,6 +1019,10 @@ namespace ts { emitNextAffectedFile: notImplemented, getSemanticDiagnosticsOfNextAffectedFile: notImplemented, }; + + function toPath(path: string) { + return ts.toPath(path, buildInfoDirectory, getCanonicalFileName); + } } export function createRedirectedBuilderProgram(state: { program: Program | undefined; compilerOptions: CompilerOptions; }, configFileParsingDiagnostics: ReadonlyArray): BuilderProgram { diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts index 94718a1b3680f..7e92e727c5011 100644 --- a/src/compiler/tsbuild.ts +++ b/src/compiler/tsbuild.ts @@ -1298,11 +1298,11 @@ namespace ts { } } - function getOldProgram({ options, builderPrograms, readFileWithCache }: SolutionBuilderState, proj: ResolvedConfigFilePath, parsed: ParsedCommandLine) { + function getOldProgram({ options, builderPrograms, readFileWithCache, host }: SolutionBuilderState, proj: ResolvedConfigFilePath, parsed: ParsedCommandLine) { if (options.force) return undefined; const value = builderPrograms.get(proj); if (value) return value; - return readBuilderProgram(parsed.options, readFileWithCache) as any as T; + return readBuilderProgram(parsed.options, readFileWithCache, host.useCaseSensitiveFileNames()) as any as T; } function afterProgramCreate({ host, watch, builderPrograms }: SolutionBuilderState, proj: ResolvedConfigFilePath, program: T) { diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts index 3ba2a5f5959af..a961c308af1d2 100644 --- a/src/compiler/watch.ts +++ b/src/compiler/watch.ts @@ -437,7 +437,7 @@ namespace ts { } namespace ts { - export function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined) { + export function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean) { if (compilerOptions.out || compilerOptions.outFile) return undefined; const buildInfoPath = getOutputPathForBuildInfo(compilerOptions); if (!buildInfoPath) return undefined; @@ -446,7 +446,7 @@ namespace ts { const buildInfo = getBuildInfo(content); if (buildInfo.version !== version) return undefined; if (!buildInfo.program) return undefined; - return createBuildProgramUsingProgramBuildInfo(buildInfo.program); + return createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, useCaseSensitiveFileNames); } export function createIncrementalCompilerHost(options: CompilerOptions, system = sys): CompilerHost { @@ -471,7 +471,7 @@ namespace ts { }: IncrementalProgramOptions): T { host = host || createIncrementalCompilerHost(options); createProgram = createProgram || createEmitAndSemanticDiagnosticsBuilderProgram as any as CreateProgram; - const oldProgram = readBuilderProgram(options, path => host!.readFile(path)) as any as T; + const oldProgram = readBuilderProgram(options, path => host!.readFile(path), host.useCaseSensitiveFileNames()) as any as T; return createProgram(rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences); } @@ -747,7 +747,7 @@ namespace ts { ((typeDirectiveNames, containingFile, redirectedReference) => resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference)); const userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives; - builderProgram = readBuilderProgram(compilerOptions, path => compilerHost.readFile(path)) as any as T; + builderProgram = readBuilderProgram(compilerOptions, path => compilerHost.readFile(path), compilerHost.useCaseSensitiveFileNames()) as any as T; synchronizeProgram(); // Update the wild card directory watch diff --git a/src/testRunner/unittests/tscWatch/incremental.ts b/src/testRunner/unittests/tscWatch/incremental.ts index 54109dec84639..e0dfb29016c2d 100644 --- a/src/testRunner/unittests/tscWatch/incremental.ts +++ b/src/testRunner/unittests/tscWatch/incremental.ts @@ -129,6 +129,14 @@ namespace ts.tscWatch { signature: Harness.mockHash(libFile.content) }; + const getCanonicalFileName = createGetCanonicalFileName(/*useCaseSensitiveFileNames*/ false); + function relativeToBuildInfo(buildInfoPath: string, path: string) { + return getRelativePathFromFile(buildInfoPath, path, getCanonicalFileName); + } + + const buildInfoPath = `${project}/tsconfig.tsbuildinfo`; + const [libFilePath, file1Path, file2Path] = [libFile.path, `${project}/file1.ts`, `${project}/file2.ts`].map(path => relativeToBuildInfo(buildInfoPath, path)); + describe("non module compilation", () => { function getFileInfo(content: string): BuilderState.FileInfo { return { version: Harness.mockHash(content), signature: Harness.mockHash(`declare ${content}\n`) }; @@ -150,7 +158,6 @@ namespace ts.tscWatch { path: `${project}/file2.js`, content: "var y = 20;\n" }; - describe("own file emit without errors", () => { const modifiedFile2Content = file2.content.replace("y", "z").replace("20", "10"); verifyIncrementalWatchEmit({ @@ -163,14 +170,14 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: getFileInfo(file2.content) + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: getFileInfo(file2.content) }, options: { incremental: true, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, - semanticDiagnosticsPerFile: [libFile.path, file1.path, file2.path] + semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] }, version }) @@ -186,14 +193,14 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: getFileInfo(modifiedFile2Content) + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: getFileInfo(modifiedFile2Content) }, options: { incremental: true, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, - semanticDiagnosticsPerFile: [libFile.path, file1.path, file2.path] + semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] }, version }) @@ -213,16 +220,16 @@ namespace ts.tscWatch { signature: Harness.mockHash("declare const y: string;\n") }; const file2ReuasableError: ProgramBuildInfoDiagnostic = [ - file2.path, [ + file2Path, [ { - file: file2.path, + file: file2Path, start: 6, length: 1, code: Diagnostics.Type_0_is_not_assignable_to_type_1.code, category: Diagnostics.Type_0_is_not_assignable_to_type_1.category, messageText: "Type '20' is not assignable to type 'string'." } - ] as ReusableDiagnostic[] + ] ]; const file2Errors = [ "file2.ts(1,7): error TS2322: Type '20' is not assignable to type 'string'.\n" @@ -238,16 +245,16 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: file2FileInfo + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: file2FileInfo }, options: { incremental: true, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ - libFile.path, - file1.path, + libFilePath, + file1Path, file2ReuasableError ] }, @@ -265,16 +272,16 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(modifiedFile1Content), - [file2.path]: file2FileInfo + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(modifiedFile1Content), + [file2Path]: file2FileInfo }, options: { incremental: true, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ - libFile.path, - file1.path, + libFilePath, + file1Path, file2ReuasableError ] }, @@ -369,14 +376,14 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: getFileInfo(file2.content) + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: getFileInfo(file2.content) }, options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, - semanticDiagnosticsPerFile: [libFile.path, file1.path, file2.path] + semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] }, version }) @@ -391,14 +398,14 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: getFileInfo(modifiedFile2Content) + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: getFileInfo(modifiedFile2Content) }, options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, - semanticDiagnosticsPerFile: [libFile.path, file1.path, file2.path] + semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] }, version }) @@ -418,16 +425,16 @@ namespace ts.tscWatch { signature: Harness.mockHash("export declare const y: string;\n") }; const file2ReuasableError: ProgramBuildInfoDiagnostic = [ - file2.path, [ + file2Path, [ { - file: file2.path, + file: file2Path, start: 13, length: 1, code: Diagnostics.Type_0_is_not_assignable_to_type_1.code, category: Diagnostics.Type_0_is_not_assignable_to_type_1.category, messageText: "Type '20' is not assignable to type 'string'." } - ] as ReusableDiagnostic[] + ] ]; const file2Errors = [ "file2.ts(1,14): error TS2322: Type '20' is not assignable to type 'string'.\n" @@ -443,16 +450,16 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: file2FileInfo + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: file2FileInfo }, options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ - libFile.path, - file1.path, + libFilePath, + file1Path, file2ReuasableError ] }, @@ -469,17 +476,17 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(modifiedFile1Content), - [file2.path]: file2FileInfo + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(modifiedFile1Content), + [file2Path]: file2FileInfo }, options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ - libFile.path, + libFilePath, file2ReuasableError, - file1.path + file1Path ] }, version diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index cbab57b0644e8..8f4f774f5d6ec 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -4450,7 +4450,7 @@ declare namespace ts { function createAbstractBuilder(rootNames: ReadonlyArray | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray, projectReferences?: ReadonlyArray): BuilderProgram; } declare namespace ts { - function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined): EmitAndSemanticDiagnosticsBuilderProgram | undefined; + function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram | undefined; function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost; interface IncrementalProgramOptions { rootNames: ReadonlyArray; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index fd254a2fe5074..7efb518603ed8 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -4450,7 +4450,7 @@ declare namespace ts { function createAbstractBuilder(rootNames: ReadonlyArray | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray, projectReferences?: ReadonlyArray): BuilderProgram; } declare namespace ts { - function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined): EmitAndSemanticDiagnosticsBuilderProgram | undefined; + function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram | undefined; function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost; interface IncrementalProgramOptions { rootNames: ReadonlyArray; diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js index f7ffde933fd36..e6fb4d53c1241 100644 --- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js +++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js @@ -30,27 +30,27 @@ export declare const lazyBar: LazyAction<() => void, typeof import("./lazyIndex" { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/bar.ts": { + "../bar.ts": { "version": "747071916", "signature": "-9232740537" }, - "/src/bundling.ts": { + "../bundling.ts": { "version": "-21659820217", "signature": "-40032907372" }, - "/src/global.d.ts": { + "../global.d.ts": { "version": "-9780226215", "signature": "-9780226215" }, - "/src/lazyindex.ts": { + "../lazyindex.ts": { "version": "-6956449754", "signature": "-6224542381" }, - "/src/index.ts": { + "../index.ts": { "version": "-11602502901", "signature": "6256067474" } @@ -63,30 +63,30 @@ export declare const lazyBar: LazyAction<() => void, typeof import("./lazyIndex" "configFilePath": "/src/tsconfig.json" }, "referencedMap": { - "/src/index.ts": [ - "/src/bundling.ts", - "/src/lazyindex.ts" + "../index.ts": [ + "../bundling.ts", + "../lazyindex.ts" ], - "/src/lazyindex.ts": [ - "/src/bar.ts" + "../lazyindex.ts": [ + "../bar.ts" ] }, "exportedModulesMap": { - "/src/index.ts": [ - "/src/bundling.ts", - "/src/lazyindex.ts" + "../index.ts": [ + "../bundling.ts", + "../lazyindex.ts" ], - "/src/lazyindex.ts": [ - "/src/bar.ts" + "../lazyindex.ts": [ + "../bar.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/bar.ts", - "/src/bundling.ts", - "/src/global.d.ts", - "/src/index.ts", - "/src/lazyindex.ts" + "../../lib/lib.d.ts", + "../bar.ts", + "../bundling.ts", + "../global.d.ts", + "../index.ts", + "../lazyindex.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js index e587db59b21c2..1de6d110e0242 100644 --- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js +++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js @@ -68,27 +68,27 @@ exports.bar = bar_1.default; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/bar.ts": { + "../bar.ts": { "version": "5936740878", "signature": "11191036521" }, - "/src/bundling.ts": { + "../bundling.ts": { "version": "-21659820217", "signature": "-40032907372" }, - "/src/global.d.ts": { + "../global.d.ts": { "version": "-9780226215", "signature": "-9780226215" }, - "/src/lazyindex.ts": { + "../lazyindex.ts": { "version": "-6956449754", "signature": "-6224542381" }, - "/src/index.ts": { + "../index.ts": { "version": "-11602502901", "signature": "18468008756" } @@ -101,30 +101,30 @@ exports.bar = bar_1.default; "configFilePath": "/src/tsconfig.json" }, "referencedMap": { - "/src/index.ts": [ - "/src/bundling.ts", - "/src/lazyindex.ts" + "../index.ts": [ + "../bundling.ts", + "../lazyindex.ts" ], - "/src/lazyindex.ts": [ - "/src/bar.ts" + "../lazyindex.ts": [ + "../bar.ts" ] }, "exportedModulesMap": { - "/src/index.ts": [ - "/src/bundling.ts", - "/src/lazyindex.ts" + "../index.ts": [ + "../bundling.ts", + "../lazyindex.ts" ], - "/src/lazyindex.ts": [ - "/src/bar.ts" + "../lazyindex.ts": [ + "../bar.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/bar.ts", - "/src/bundling.ts", - "/src/global.d.ts", - "/src/index.ts", - "/src/lazyindex.ts" + "../../lib/lib.d.ts", + "../bar.ts", + "../bundling.ts", + "../global.d.ts", + "../index.ts", + "../lazyindex.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js b/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js index b0549b1a8fb4e..fb85601c1601a 100644 --- a/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js +++ b/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js @@ -21,19 +21,19 @@ type A = HKT[typeof sym]; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/src/globals.d.ts": { + "./src/globals.d.ts": { "version": "-1994196675", "signature": "-1994196675" }, - "/src/src/hkt.ts": { + "./src/hkt.ts": { "version": "675797797", "signature": "2373810515" }, - "/src/src/main.ts": { + "./src/main.ts": { "version": "-27494779858", "signature": "-7779857705" } @@ -44,20 +44,20 @@ type A = HKT[typeof sym]; "configFilePath": "/src/tsconfig.json" }, "referencedMap": { - "/src/src/main.ts": [ - "/src/src/hkt.ts" + "./src/main.ts": [ + "./src/hkt.ts" ] }, "exportedModulesMap": { - "/src/src/main.ts": [ - "/src/src/hkt.ts" + "./src/main.ts": [ + "./src/hkt.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/src/globals.d.ts", - "/src/src/hkt.ts", - "/src/src/main.ts" + "../lib/lib.d.ts", + "./src/globals.d.ts", + "./src/hkt.ts", + "./src/main.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js b/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js index a48d6df88e45c..48ae88b77cbf9 100644 --- a/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js +++ b/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js @@ -14,19 +14,19 @@ var x = 10; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/src/globals.d.ts": { + "./src/globals.d.ts": { "version": "-1994196675", "signature": "-1994196675" }, - "/src/src/hkt.ts": { + "./src/hkt.ts": { "version": "675797797", "signature": "2373810515" }, - "/src/src/main.ts": { + "./src/main.ts": { "version": "-28387946490", "signature": "-7779857705" } @@ -37,20 +37,20 @@ var x = 10; "configFilePath": "/src/tsconfig.json" }, "referencedMap": { - "/src/src/main.ts": [ - "/src/src/hkt.ts" + "./src/main.ts": [ + "./src/hkt.ts" ] }, "exportedModulesMap": { - "/src/src/main.ts": [ - "/src/src/hkt.ts" + "./src/main.ts": [ + "./src/hkt.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/src/globals.d.ts", - "/src/src/hkt.ts", - "/src/src/main.ts" + "../lib/lib.d.ts", + "./src/globals.d.ts", + "./src/hkt.ts", + "./src/main.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js index a698d6c34cfc6..e21e1a3b4cbc4 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js @@ -171,19 +171,19 @@ export class someClass { } { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-13387000654", "signature": "12514354613" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -198,10 +198,10 @@ export class someClass { } "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" @@ -211,19 +211,19 @@ export class someClass { } { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-2069755619", "signature": "-2069755619" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "./index.ts": { "version": "-5786964698", "signature": "-6548680073" } @@ -237,21 +237,21 @@ export class someClass { } "configFilePath": "/src/logic/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" @@ -261,23 +261,23 @@ export class someClass { } { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-2069755619", "signature": "-2069755619" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "../logic/index.ts": { "version": "-6548680073", "signature": "-6548680073" }, - "/src/tests/index.ts": { + "./index.ts": { "version": "12336236525", "signature": "-9209611" } @@ -290,29 +290,29 @@ export class someClass { } "configFilePath": "/src/tests/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts", - "/src/logic/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts", + "../logic/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts", - "/src/tests/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "../logic/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js index 69c7b20d5068e..90d449acc855b 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js @@ -20,19 +20,19 @@ export declare function multiply(a: number, b: number): number; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "-8396256275" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "1874987148" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -46,10 +46,10 @@ export declare function multiply(a: number, b: number): number; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js index 53f222a4bf510..444c03f4d095a 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js @@ -24,19 +24,19 @@ export declare const m: typeof mod; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "./index.ts": { "version": "-5786964698", "signature": "-6548680073" } @@ -51,21 +51,21 @@ export declare const m: typeof mod; "configFilePath": "/src/logic/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" @@ -75,23 +75,23 @@ export declare const m: typeof mod; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "../logic/index.ts": { "version": "-6548680073", "signature": "-6548680073" }, - "/src/tests/index.ts": { + "./index.ts": { "version": "12336236525", "signature": "-9209611" } @@ -104,29 +104,29 @@ export declare const m: typeof mod; "configFilePath": "/src/tests/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts", - "/src/logic/decls/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts", + "../logic/decls/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts", - "/src/tests/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "../logic/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js index 53bd9b167fb6e..95de840f6bc8c 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js @@ -28,23 +28,23 @@ exports.multiply = multiply; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "8926001564", "signature": "8926001564" }, - "/lib/lib.esnext.d.ts": { + "../../lib/lib.esnext.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "-8396256275" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "1874987148" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -59,11 +59,11 @@ exports.multiply = multiply; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/lib/lib.esnext.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "../../lib/lib.esnext.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js index aae81ea9fdcac..715b0331f164f 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js @@ -24,19 +24,19 @@ class someClass { } { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-16698397488", "signature": "11051732871" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -51,10 +51,10 @@ class someClass { } "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js index ef63741766af9..e61fc8ae88e7a 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js @@ -184,19 +184,19 @@ exports.multiply = multiply; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "11051732871" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -211,10 +211,10 @@ exports.multiply = multiply; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" @@ -369,19 +369,19 @@ sourceFile:index.ts { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "./index.ts": { "version": "-5786964698", "signature": "-6548680073" } @@ -395,21 +395,21 @@ sourceFile:index.ts "configFilePath": "/src/logic/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" @@ -435,23 +435,23 @@ exports.m = mod; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "../logic/index.ts": { "version": "-6548680073", "signature": "-6548680073" }, - "/src/tests/index.ts": { + "./index.ts": { "version": "12336236525", "signature": "-9209611" } @@ -464,29 +464,29 @@ exports.m = mod; "configFilePath": "/src/tests/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts", - "/src/logic/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts", + "../logic/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts", - "/src/tests/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "../logic/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js index 90f10c0a25c4c..9e1c9e71efb5d 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js @@ -26,19 +26,19 @@ exports.multiply = multiply; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "-8396256275" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "1874987148" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -51,10 +51,10 @@ exports.multiply = multiply; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js index ef63741766af9..e61fc8ae88e7a 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js @@ -184,19 +184,19 @@ exports.multiply = multiply; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "11051732871" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -211,10 +211,10 @@ exports.multiply = multiply; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" @@ -369,19 +369,19 @@ sourceFile:index.ts { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "./index.ts": { "version": "-5786964698", "signature": "-6548680073" } @@ -395,21 +395,21 @@ sourceFile:index.ts "configFilePath": "/src/logic/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" @@ -435,23 +435,23 @@ exports.m = mod; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "../logic/index.ts": { "version": "-6548680073", "signature": "-6548680073" }, - "/src/tests/index.ts": { + "./index.ts": { "version": "12336236525", "signature": "-9209611" } @@ -464,29 +464,29 @@ exports.m = mod; "configFilePath": "/src/tests/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts", - "/src/logic/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts", + "../logic/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts", - "/src/tests/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "../logic/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js index b3b74cb388c9a..809c003d732dd 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js @@ -184,19 +184,19 @@ exports.multiply = multiply; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "11051732871" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -211,10 +211,10 @@ exports.multiply = multiply; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" @@ -369,19 +369,19 @@ sourceFile:index.ts { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "./index.ts": { "version": "-5786964698", "signature": "-6548680073" } @@ -396,21 +396,21 @@ sourceFile:index.ts "configFilePath": "/src/logic/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" @@ -452,23 +452,23 @@ exports.m = mod; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "../logic/index.ts": { "version": "-6548680073", "signature": "-6548680073" }, - "/src/tests/index.ts": { + "./index.ts": { "version": "12336236525", "signature": "-9209611" } @@ -481,29 +481,29 @@ exports.m = mod; "configFilePath": "/src/tests/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts", - "/src/logic/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts", + "../logic/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts", - "/src/tests/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "../logic/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js index fdf7cc3841291..884cb3d618606 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js @@ -45,23 +45,23 @@ export function multiply(a, b) { return a * b; } { "program": { "fileInfos": { - "/lib/lib.esnext.d.ts": { + "../../lib/lib.esnext.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/lib/lib.esnext.full.d.ts": { + "../../lib/lib.esnext.full.d.ts": { "version": "8926001564", "signature": "8926001564" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "-8396256275" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "1874987148" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -76,11 +76,11 @@ export function multiply(a, b) { return a * b; } "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.esnext.d.ts", - "/lib/lib.esnext.full.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.esnext.d.ts", + "../../lib/lib.esnext.full.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" From 9446fc0c0c10c903c52c70847aca45c573703eaa Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 19 Jun 2019 12:26:13 -0700 Subject: [PATCH 2/4] Convert options to relative paths --- src/compiler/builder.ts | 79 ++++++++++++++++++- src/compiler/commandLineParser.ts | 3 +- .../unittests/tscWatch/incremental.ts | 44 +++++++++-- .../inferred-type-from-transitive-module.js | 4 +- .../inferred-type-from-transitive-module.js | 4 +- ...s-merged-and-contains-late-bound-member.js | 4 +- ...s-merged-and-contains-late-bound-member.js | 4 +- .../incremental-declaration-changes/sample.js | 6 +- .../when-declaration-option-changes.js | 2 +- ...en-logic-config-changes-declaration-dir.js | 6 +- .../when-target-option-changes.js | 2 +- .../sample.js | 2 +- .../tsbuild/sample1/initial-Build/sample.js | 6 +- .../when-declaration-option-changes.js | 2 +- ...en-logic-config-changes-declaration-dir.js | 6 +- .../when-logic-specifies-tsBuildInfoFile.js | 8 +- .../when-target-option-changes.js | 2 +- 17 files changed, 144 insertions(+), 40 deletions(-) diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts index 541cc24413ff4..d70f55edc9dac 100644 --- a/src/compiler/builder.ts +++ b/src/compiler/builder.ts @@ -619,7 +619,10 @@ namespace ts { fileInfos[relativeToBuildInfo(key)] = signature === undefined ? value : { version: value.version, signature }; }); - const result: ProgramBuildInfo = { fileInfos, options: state.compilerOptions }; + const result: ProgramBuildInfo = { + fileInfos, + options: convertToReusableCompilerOptions(state.compilerOptions, relativeToBuildInfo) + }; if (state.referencedMap) { const referencedMap: MapLike = {}; state.referencedMap.forEach((value, key) => { @@ -663,6 +666,40 @@ namespace ts { } } + function convertToReusableCompilerOptions(options: CompilerOptions, relativeToBuildInfo: (path: string) => string) { + const result: CompilerOptions = {}; + const optionsNameMap = getOptionNameMap().optionNameMap; + + for (const name in options) { + if (hasProperty(options, name)) { + result[name] = convertToReusableCompilerOptionValue( + optionsNameMap.get(name.toLowerCase()), + options[name] as CompilerOptionsValue, + relativeToBuildInfo + ); + } + } + if (result.configFilePath) { + result.configFilePath = relativeToBuildInfo(result.configFilePath); + } + return result; + } + + function convertToReusableCompilerOptionValue(option: CommandLineOption | undefined, value: CompilerOptionsValue, relativeToBuildInfo: (path: string) => string) { + if (option) { + if (option.type === "list") { + const values = value as ReadonlyArray; + if (option.element.isFilePath && values.length) { + return values.map(relativeToBuildInfo); + } + } + else if (option.isFilePath) { + return relativeToBuildInfo(value as string); + } + } + return value; + } + function convertToReusableDiagnostics(diagnostics: ReadonlyArray, relativeToBuildInfo: (path: string) => string): ReadonlyArray { Debug.assert(!!diagnostics.length); return diagnostics.map(diagnostic => { @@ -991,7 +1028,7 @@ namespace ts { const state: ReusableBuilderProgramState = { fileInfos, - compilerOptions: program.options, + compilerOptions: convertFromReusableCompilerOptions(program.options, toAbsolutePath), referencedMap: getMapOfReferencedSet(program.referencedMap, toPath), exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap, toPath), semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && arrayToMap(program.semanticDiagnosticsPerFile, value => isString(value) ? value : value[0], value => isString(value) ? emptyArray : value[1]), @@ -1023,6 +1060,44 @@ namespace ts { function toPath(path: string) { return ts.toPath(path, buildInfoDirectory, getCanonicalFileName); } + + function toAbsolutePath(path: string) { + return getNormalizedAbsolutePath(path, buildInfoDirectory); + } + } + + function convertFromReusableCompilerOptions(options: CompilerOptions, toAbsolutePath: (path: string) => string) { + const result: CompilerOptions = {}; + const optionsNameMap = getOptionNameMap().optionNameMap; + + for (const name in options) { + if (hasProperty(options, name)) { + result[name] = convertFromReusableCompilerOptionValue( + optionsNameMap.get(name.toLowerCase()), + options[name] as CompilerOptionsValue, + toAbsolutePath + ); + } + } + if (result.configFilePath) { + result.configFilePath = toAbsolutePath(result.configFilePath); + } + return result; + } + + function convertFromReusableCompilerOptionValue(option: CommandLineOption | undefined, value: CompilerOptionsValue, toAbsolutePath: (path: string) => string) { + if (option) { + if (option.type === "list") { + const values = value as ReadonlyArray; + if (option.element.isFilePath && values.length) { + return values.map(toAbsolutePath); + } + } + else if (option.isFilePath) { + return toAbsolutePath(value as string); + } + } + return value; } export function createRedirectedBuilderProgram(state: { program: Program | undefined; compilerOptions: CompilerOptions; }, configFileParsingDiagnostics: ReadonlyArray): BuilderProgram { diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 394a94cb663b7..9fa2dfe1501c6 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -969,7 +969,8 @@ namespace ts { return typeAcquisition; } - function getOptionNameMap(): OptionNameMap { + /* @internal */ + export function getOptionNameMap(): OptionNameMap { return optionNameMapCache || (optionNameMapCache = createOptionNameMap(optionDeclarations)); } diff --git a/src/testRunner/unittests/tscWatch/incremental.ts b/src/testRunner/unittests/tscWatch/incremental.ts index e0dfb29016c2d..03c63bb95ffab 100644 --- a/src/testRunner/unittests/tscWatch/incremental.ts +++ b/src/testRunner/unittests/tscWatch/incremental.ts @@ -174,7 +174,10 @@ namespace ts.tscWatch { [file1Path]: getFileInfo(file1.content), [file2Path]: getFileInfo(file2.content) }, - options: { incremental: true, configFilePath: configFile.path }, + options: { + incremental: true, + configFilePath: "./tsconfig.json" + }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] @@ -197,7 +200,10 @@ namespace ts.tscWatch { [file1Path]: getFileInfo(file1.content), [file2Path]: getFileInfo(modifiedFile2Content) }, - options: { incremental: true, configFilePath: configFile.path }, + options: { + incremental: true, + configFilePath: "./tsconfig.json" + }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] @@ -249,7 +255,10 @@ namespace ts.tscWatch { [file1Path]: getFileInfo(file1.content), [file2Path]: file2FileInfo }, - options: { incremental: true, configFilePath: configFile.path }, + options: { + incremental: true, + configFilePath: "./tsconfig.json" + }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ @@ -276,7 +285,10 @@ namespace ts.tscWatch { [file1Path]: getFileInfo(modifiedFile1Content), [file2Path]: file2FileInfo }, - options: { incremental: true, configFilePath: configFile.path }, + options: { + incremental: true, + configFilePath: "./tsconfig.json" + }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ @@ -380,7 +392,11 @@ namespace ts.tscWatch { [file1Path]: getFileInfo(file1.content), [file2Path]: getFileInfo(file2.content) }, - options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, + options: { + incremental: true, + module: ModuleKind.AMD, + configFilePath: "./tsconfig.json" + }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] @@ -402,7 +418,11 @@ namespace ts.tscWatch { [file1Path]: getFileInfo(file1.content), [file2Path]: getFileInfo(modifiedFile2Content) }, - options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, + options: { + incremental: true, + module: ModuleKind.AMD, + configFilePath: "./tsconfig.json" + }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] @@ -454,7 +474,11 @@ namespace ts.tscWatch { [file1Path]: getFileInfo(file1.content), [file2Path]: file2FileInfo }, - options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, + options: { + incremental: true, + module: ModuleKind.AMD, + configFilePath: "./tsconfig.json" + }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ @@ -480,7 +504,11 @@ namespace ts.tscWatch { [file1Path]: getFileInfo(modifiedFile1Content), [file2Path]: file2FileInfo }, - options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, + options: { + incremental: true, + module: ModuleKind.AMD, + configFilePath: "./tsconfig.json" + }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js index e6fb4d53c1241..c9334a7bcc9a5 100644 --- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js +++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js @@ -58,9 +58,9 @@ export declare const lazyBar: LazyAction<() => void, typeof import("./lazyIndex" "options": { "target": 1, "declaration": true, - "outDir": "/src/obj", + "outDir": "./", "incremental": true, - "configFilePath": "/src/tsconfig.json" + "configFilePath": "../tsconfig.json" }, "referencedMap": { "../index.ts": [ diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js index 1de6d110e0242..88e0b710bb4c3 100644 --- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js +++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js @@ -96,9 +96,9 @@ exports.bar = bar_1.default; "options": { "target": 1, "declaration": true, - "outDir": "/src/obj", + "outDir": "./", "incremental": true, - "configFilePath": "/src/tsconfig.json" + "configFilePath": "../tsconfig.json" }, "referencedMap": { "../index.ts": [ diff --git a/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js b/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js index fb85601c1601a..bfd580e9a995a 100644 --- a/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js +++ b/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js @@ -39,9 +39,9 @@ type A = HKT[typeof sym]; } }, "options": { - "rootDir": "/src/src", + "rootDir": "./src", "incremental": true, - "configFilePath": "/src/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "./src/main.ts": [ diff --git a/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js b/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js index 48ae88b77cbf9..d1e15d4ca9950 100644 --- a/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js +++ b/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js @@ -32,9 +32,9 @@ var x = 10; } }, "options": { - "rootDir": "/src/src", + "rootDir": "./src", "incremental": true, - "configFilePath": "/src/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "./src/main.ts": [ diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js index e21e1a3b4cbc4..cc92be460211a 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js @@ -193,7 +193,7 @@ export class someClass { } "declaration": true, "declarationMap": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, @@ -234,7 +234,7 @@ export class someClass { } "sourceMap": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/logic/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "./index.ts": [ @@ -287,7 +287,7 @@ export class someClass { } "declaration": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/tests/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "../logic/index.ts": [ diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js index 90d449acc855b..d58354590cb65 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js @@ -41,7 +41,7 @@ export declare function multiply(a: number, b: number): number; "incremental": true, "declaration": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js index 444c03f4d095a..feefdf8f8161c 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js @@ -44,11 +44,11 @@ export declare const m: typeof mod; "options": { "composite": true, "declaration": true, - "declarationDir": "/src/logic/decls", + "declarationDir": "./decls", "sourceMap": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/logic/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "./index.ts": [ @@ -101,7 +101,7 @@ export declare const m: typeof mod; "declaration": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/tests/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "../logic/index.ts": [ diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js index 95de840f6bc8c..8e740f6a2359f 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js @@ -54,7 +54,7 @@ exports.multiply = multiply; "listFiles": true, "listEmittedFiles": true, "target": 1, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js index 715b0331f164f..ed2fb38595b0c 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js @@ -46,7 +46,7 @@ class someClass { } "declaration": true, "declarationMap": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js index e61fc8ae88e7a..75e23dfa0af6b 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js @@ -206,7 +206,7 @@ exports.multiply = multiply; "declaration": true, "declarationMap": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, @@ -392,7 +392,7 @@ sourceFile:index.ts "sourceMap": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/logic/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "./index.ts": [ @@ -461,7 +461,7 @@ exports.m = mod; "declaration": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/tests/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "../logic/index.ts": [ diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js index 9e1c9e71efb5d..8a66ec9da1f70 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js @@ -46,7 +46,7 @@ exports.multiply = multiply; "options": { "incremental": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js index e61fc8ae88e7a..75e23dfa0af6b 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js @@ -206,7 +206,7 @@ exports.multiply = multiply; "declaration": true, "declarationMap": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, @@ -392,7 +392,7 @@ sourceFile:index.ts "sourceMap": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/logic/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "./index.ts": [ @@ -461,7 +461,7 @@ exports.m = mod; "declaration": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/tests/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "../logic/index.ts": [ diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js index 809c003d732dd..f419af6508a3c 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js @@ -206,7 +206,7 @@ exports.multiply = multiply; "declaration": true, "declarationMap": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, @@ -388,12 +388,12 @@ sourceFile:index.ts }, "options": { "composite": true, - "tsBuildInfoFile": "/src/logic/ownFile.tsbuildinfo", + "tsBuildInfoFile": "./ownFile.tsbuildinfo", "declaration": true, "sourceMap": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/logic/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "./index.ts": [ @@ -478,7 +478,7 @@ exports.m = mod; "declaration": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/tests/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "../logic/index.ts": [ diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js index 884cb3d618606..895ac5e4bc5b1 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js @@ -71,7 +71,7 @@ export function multiply(a, b) { return a * b; } "listFiles": true, "listEmittedFiles": true, "target": 8, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, From b9fc44ece7f6c067fd7cb225cceee74f51fc5990 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 19 Jun 2019 13:17:26 -0700 Subject: [PATCH 3/4] Bundle info paths as relative to tsbuildinfo file --- src/compiler/emitter.ts | 50 ++++++++++++++----- src/compiler/types.ts | 1 + .../unittests/tscWatch/incremental.ts | 8 +-- .../modules-and-globals-mixed-in-amd.js | 24 ++++----- .../multiple-emitHelpers-in-all-projects.js | 24 ++++----- .../multiple-prologues-in-all-projects.js | 24 ++++----- .../shebang-in-all-projects.js | 24 ++++----- .../stripInternal.js | 24 ++++----- .../triple-slash-refs-in-all-projects.js | 24 ++++----- .../multiple-emitHelpers-in-all-projects.js | 24 ++++----- .../multiple-prologues-in-all-projects.js | 24 ++++----- .../stripInternal.js | 24 ++++----- .../modules-and-globals-mixed-in-amd.js | 24 ++++----- .../multiple-emitHelpers-in-all-projects.js | 24 ++++----- .../multiple-prologues-in-all-projects.js | 24 ++++----- .../initial-Build/shebang-in-all-projects.js | 24 ++++----- .../initial-Build/stripInternal.js | 24 ++++----- .../triple-slash-refs-in-all-projects.js | 24 ++++----- ...e-resolution-finds-original-source-file.js | 24 ++++----- .../baseline-sectioned-sourcemaps.js | 28 +++++------ .../emitHelpers-in-all-projects.js | 28 +++++------ .../multiple-prologues-in-all-projects.js | 28 +++++------ .../shebang-in-all-projects.js | 28 +++++------ .../strict-in-all-projects.js | 28 +++++------ ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- .../stripInternal.js | 28 +++++------ .../triple-slash-refs-in-all-projects.js | 28 +++++------ .../baseline-sectioned-sourcemaps.js | 28 +++++------ .../emitHelpers-in-all-projects.js | 28 +++++------ ...tHelpers-in-only-one-dependency-project.js | 28 +++++------ .../multiple-emitHelpers-in-all-projects.js | 28 +++++------ ...tiple-emitHelpers-in-different-projects.js | 28 +++++------ .../multiple-prologues-in-all-projects.js | 28 +++++------ ...ultiple-prologues-in-different-projects.js | 28 +++++------ .../shebang-in-all-projects.js | 28 +++++------ .../shebang-in-only-one-dependency-project.js | 28 +++++------ .../strict-in-all-projects.js | 28 +++++------ .../strict-in-one-dependency.js | 28 +++++------ ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- .../stripInternal-jsdoc-style-comment.js | 28 +++++------ ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- ...-jsdoc-style-with-comments-emit-enabled.js | 28 +++++------ ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- ...tripInternal-with-comments-emit-enabled.js | 28 +++++------ .../stripInternal.js | 28 +++++------ .../triple-slash-refs-in-all-projects.js | 28 +++++------ .../triple-slash-refs-in-one-project.js | 28 +++++------ ...t-composite-but-uses-project-references.js | 8 +-- ...-source-files-are-empty-in-the-own-file.js | 28 +++++------ .../emitHelpers-in-all-projects.js | 28 +++++------ ...tHelpers-in-only-one-dependency-project.js | 28 +++++------ .../multiple-emitHelpers-in-all-projects.js | 28 +++++------ ...tiple-emitHelpers-in-different-projects.js | 28 +++++------ .../multiple-prologues-in-all-projects.js | 28 +++++------ ...ultiple-prologues-in-different-projects.js | 28 +++++------ .../strict-in-all-projects.js | 28 +++++------ .../strict-in-one-dependency.js | 28 +++++------ ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- .../stripInternal-jsdoc-style-comment.js | 28 +++++------ ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- ...tripInternal-with-comments-emit-enabled.js | 28 +++++------ .../stripInternal.js | 28 +++++------ .../baseline-sectioned-sourcemaps.js | 34 ++++++------- .../declarationMap-and-sourceMap-disabled.js | 14 +++--- .../emitHelpers-in-all-projects.js | 34 ++++++------- ...tHelpers-in-only-one-dependency-project.js | 34 ++++++------- .../multiple-emitHelpers-in-all-projects.js | 34 ++++++------- ...tiple-emitHelpers-in-different-projects.js | 34 ++++++------- .../multiple-prologues-in-all-projects.js | 34 ++++++------- ...ultiple-prologues-in-different-projects.js | 34 ++++++------- .../initial-Build/shebang-in-all-projects.js | 34 ++++++------- .../shebang-in-only-one-dependency-project.js | 34 ++++++------- .../initial-Build/strict-in-all-projects.js | 34 ++++++------- .../initial-Build/strict-in-one-dependency.js | 34 ++++++------- ...hen-internal-is-inside-another-internal.js | 34 ++++++------- ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- .../stripInternal-jsdoc-style-comment.js | 34 ++++++------- ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- ...-jsdoc-style-with-comments-emit-enabled.js | 34 ++++++------- ...l-when-few-members-of-enum-are-internal.js | 34 ++++++------- ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- ...tripInternal-with-comments-emit-enabled.js | 34 ++++++------- .../initial-Build/stripInternal.js | 34 ++++++------- .../triple-slash-refs-in-all-projects.js | 34 ++++++------- .../triple-slash-refs-in-one-project.js | 34 ++++++------- ...roject-is-not-composite-but-incremental.js | 34 ++++++------- ...t-composite-but-uses-project-references.js | 14 +++--- ...final-project-specifies-tsBuildInfoFile.js | 34 ++++++------- ...-source-files-are-empty-in-the-own-file.js | 34 ++++++------- 92 files changed, 1334 insertions(+), 1309 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index ddd273c360201..456a53f2651e9 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -249,14 +249,16 @@ namespace ts { }; function emitSourceFileOrBundle({ jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath }: EmitFileNames, sourceFileOrBundle: SourceFile | Bundle | undefined) { + let buildInfoDirectory: string | undefined; if (buildInfoPath && sourceFileOrBundle && isBundle(sourceFileOrBundle)) { + buildInfoDirectory = getDirectoryPath(buildInfoPath); bundleBuildInfo = { - commonSourceDirectory: host.getCommonSourceDirectory(), - sourceFiles: sourceFileOrBundle.sourceFiles.map(file => file.fileName) + commonSourceDirectory: relativeToBuildInfo(host.getCommonSourceDirectory()), + sourceFiles: sourceFileOrBundle.sourceFiles.map(file => relativeToBuildInfo(file.fileName)) }; } - emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath); - emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath); + emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo); + emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo); emitBuildInfo(bundleBuildInfo, buildInfoPath); if (!emitSkipped && emittedFilesList) { @@ -278,6 +280,10 @@ namespace ts { emittedFilesList.push(declarationMapPath); } } + + function relativeToBuildInfo(path: string) { + return ensurePathIsNonModuleName(getRelativePathFromDirectory(buildInfoDirectory!, path, host.getCanonicalFileName)); + } } function emitBuildInfo(bundle: BundleBuildInfo | undefined, buildInfoPath: string | undefined) { @@ -291,7 +297,11 @@ namespace ts { writeFile(host, emitterDiagnostics, buildInfoPath, getBuildInfoText({ bundle, program, version }), /*writeByteOrderMark*/ false); } - function emitJsFileOrBundle(sourceFileOrBundle: SourceFile | Bundle | undefined, jsFilePath: string | undefined, sourceMapFilePath: string | undefined) { + function emitJsFileOrBundle( + sourceFileOrBundle: SourceFile | Bundle | undefined, + jsFilePath: string | undefined, + sourceMapFilePath: string | undefined, + relativeToBuildInfo: (path: string) => string) { if (!sourceFileOrBundle || emitOnlyDtsFiles || !jsFilePath) { return; } @@ -314,7 +324,8 @@ namespace ts { inlineSourceMap: compilerOptions.inlineSourceMap, inlineSources: compilerOptions.inlineSources, extendedDiagnostics: compilerOptions.extendedDiagnostics, - writeBundleFileInfo: !!bundleBuildInfo + writeBundleFileInfo: !!bundleBuildInfo, + relativeToBuildInfo }; // Create a printer to print the nodes @@ -335,7 +346,11 @@ namespace ts { if (bundleBuildInfo) bundleBuildInfo.js = printer.bundleFileInfo; } - function emitDeclarationFileOrBundle(sourceFileOrBundle: SourceFile | Bundle | undefined, declarationFilePath: string | undefined, declarationMapPath: string | undefined) { + function emitDeclarationFileOrBundle( + sourceFileOrBundle: SourceFile | Bundle | undefined, + declarationFilePath: string | undefined, + declarationMapPath: string | undefined, + relativeToBuildInfo: (path: string) => string) { if (!sourceFileOrBundle || !(declarationFilePath && !isInJSFile(sourceFileOrBundle))) { return; } @@ -366,7 +381,8 @@ namespace ts { extendedDiagnostics: compilerOptions.extendedDiagnostics, onlyPrintJsDocStyle: true, writeBundleFileInfo: !!bundleBuildInfo, - recordInternalSection: !!bundleBuildInfo + recordInternalSection: !!bundleBuildInfo, + relativeToBuildInfo }; const declarationPrinter = createPrinter(printerOptions, { @@ -613,10 +629,10 @@ namespace ts { getNewLine(): string; } - function createSourceFilesFromBundleBuildInfo(bundle: BundleBuildInfo): ReadonlyArray { + function createSourceFilesFromBundleBuildInfo(bundle: BundleBuildInfo, buildInfoDirectory: string): ReadonlyArray { const sourceFiles = bundle.sourceFiles.map(fileName => { const sourceFile = createNode(SyntaxKind.SourceFile, 0, 0) as SourceFile; - sourceFile.fileName = fileName; + sourceFile.fileName = getNormalizedAbsolutePath(fileName, buildInfoDirectory); sourceFile.text = ""; sourceFile.statements = createNodeArray(); return sourceFile; @@ -660,6 +676,7 @@ namespace ts { const buildInfo = getBuildInfo(buildInfoText); if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationText && !buildInfo.bundle.dts)) return buildInfoPath!; + const buildInfoDirectory = getDirectoryPath(buildInfoPath!); const ownPrependInput = createInputFiles( jsFileText, declarationText!, @@ -675,11 +692,11 @@ namespace ts { ); const outputFiles: OutputFile[] = []; const prependNodes = createPrependNodes(config.projectReferences, getCommandLine, f => host.readFile(f)); - const sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle); + const sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle, buildInfoDirectory); const emitHost: EmitHost = { getPrependNodes: memoize(() => [...prependNodes, ownPrependInput]), getCanonicalFileName: host.getCanonicalFileName, - getCommonSourceDirectory: () => buildInfo.bundle!.commonSourceDirectory, + getCommonSourceDirectory: () => getNormalizedAbsolutePath(buildInfo.bundle!.commonSourceDirectory, buildInfoDirectory), getCompilerOptions: () => config.options, getCurrentDirectory: () => host.getCurrentDirectory(), getNewLine: () => host.getNewLine(), @@ -774,6 +791,7 @@ namespace ts { let write = writeBase; let isOwnFileEmit: boolean; const bundleFileInfo = printerOptions.writeBundleFileInfo ? { sections: [] } as BundleFileInfo : undefined; + const relativeToBuildInfo = bundleFileInfo ? Debug.assertDefined(printerOptions.relativeToBuildInfo) : undefined; const recordInternalSection = printerOptions.recordInternalSection; let sourceFileTextPos = 0; let sourceFileTextKind: BundleFileTextLikeKind = BundleFileSectionKind.Text; @@ -942,7 +960,13 @@ namespace ts { if (prepend.oldFileOfCurrentEmit) bundleFileInfo.sections.push(...newSections); else { newSections.forEach(section => Debug.assert(isBundleFileTextLike(section))); - bundleFileInfo.sections.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.Prepend, data: (prepend as UnparsedSource).fileName, texts: newSections as BundleFileTextLike[] }); + bundleFileInfo.sections.push({ + pos, + end: writer.getTextPos(), + kind: BundleFileSectionKind.Prepend, + data: relativeToBuildInfo!((prepend as UnparsedSource).fileName), + texts: newSections as BundleFileTextLike[] + }); } } } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 845c63b707bc8..761c9d837905c 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -5726,6 +5726,7 @@ namespace ts { /*@internal*/ writeBundleFileInfo?: boolean; /*@internal*/ recordInternalSection?: boolean; /*@internal*/ stripInternal?: boolean; + /*@internal*/ relativeToBuildInfo?: (path: string) => string; } /* @internal */ diff --git a/src/testRunner/unittests/tscWatch/incremental.ts b/src/testRunner/unittests/tscWatch/incremental.ts index 03c63bb95ffab..15f5a6dbe5fae 100644 --- a/src/testRunner/unittests/tscWatch/incremental.ts +++ b/src/testRunner/unittests/tscWatch/incremental.ts @@ -322,8 +322,8 @@ namespace ts.tscWatch { path: `${project}/out.tsbuildinfo`, content: getBuildInfoText({ bundle: { - commonSourceDirectory: `${project}/`, - sourceFiles: [file1.path, file2.path], + commonSourceDirectory: relativeToBuildInfo(`${project}/out.tsbuildinfo`, `${project}/`), + sourceFiles: [file1Path, file2Path], js: { sections: [ { pos: 0, end: outFile.content.length, kind: BundleFileSectionKind.Text } @@ -550,8 +550,8 @@ namespace ts.tscWatch { path: `${project}/out.tsbuildinfo`, content: getBuildInfoText({ bundle: { - commonSourceDirectory: `${project}/`, - sourceFiles: [file1.path, file2.path], + commonSourceDirectory: relativeToBuildInfo(`${project}/out.tsbuildinfo`, `${project}/`), + sourceFiles: [file1Path, file2Path], js: { sections: [ { pos: 0, end: outFile.content.length, kind: BundleFileSectionKind.Text } diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/modules-and-globals-mixed-in-amd.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/modules-and-globals-mixed-in-amd.js index 1df2f57322a7d..e30eed1615a04 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/modules-and-globals-mixed-in-amd.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/modules-and-globals-mixed-in-amd.js @@ -221,10 +221,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -232,7 +232,7 @@ sourceFile:file4.ts "pos": 0, "end": 438, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 0, @@ -254,7 +254,7 @@ sourceFile:file4.ts "pos": 0, "end": 171, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -278,7 +278,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (0-438):: /src/lib/module.js texts:: 1 +prepend: (0-438):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (0-438) var myGlob = 20; @@ -308,7 +308,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-171):: /src/lib/module.d.ts texts:: 1 +prepend: (0-171):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-171) declare const myGlob = 20; @@ -496,12 +496,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js index e71e158b6bcf0..6297215f3ca2b 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js @@ -593,10 +593,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -622,7 +622,7 @@ sourceFile:file4.ts "pos": 1180, "end": 1935, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 1180, @@ -651,7 +651,7 @@ sourceFile:file4.ts "pos": 0, "end": 227, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -712,7 +712,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (1180-1935):: /src/lib/module.js texts:: 1 +prepend: (1180-1935):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1935) var myGlob = 20; @@ -762,7 +762,7 @@ appfile4Spread.apply(void 0, __spread([10, 20, 30])); ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-227):: /src/lib/module.d.ts texts:: 1 +prepend: (0-227):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-227) declare const myGlob = 20; @@ -1171,12 +1171,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js index 0e846ce4745c6..689dc08570f5f 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js @@ -305,10 +305,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -340,7 +340,7 @@ sourceFile:file4.ts "pos": 62, "end": 523, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 62, @@ -390,7 +390,7 @@ sourceFile:file4.ts "pos": 0, "end": 171, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -426,7 +426,7 @@ prologue: (30-44):: myPrologue3 prologue: (46-60):: myPrologue2 "myPrologue2"; ---------------------------------------------------------------------- -prepend: (62-523):: /src/lib/module.js texts:: 1 +prepend: (62-523):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (62-523) var myGlob = 20; @@ -458,7 +458,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-171):: /src/lib/module.d.ts texts:: 1 +prepend: (0-171):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-171) declare const myGlob = 20; @@ -698,12 +698,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/shebang-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/shebang-in-all-projects.js index d5cd667821c5c..d55f61ae9253e 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/shebang-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/shebang-in-all-projects.js @@ -226,10 +226,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -237,7 +237,7 @@ sourceFile:file4.ts "pos": 25, "end": 463, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 25, @@ -259,7 +259,7 @@ sourceFile:file4.ts "pos": 25, "end": 196, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 25, @@ -283,7 +283,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (25-463):: /src/lib/module.js texts:: 1 +prepend: (25-463):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (25-463) var myGlob = 20; @@ -313,7 +313,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (25-196):: /src/lib/module.d.ts texts:: 1 +prepend: (25-196):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (25-196) declare const myGlob = 20; @@ -506,12 +506,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/stripInternal.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/stripInternal.js index 967ca7d4a1997..16f1d50a224ea 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/stripInternal.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/stripInternal.js @@ -1664,10 +1664,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -1675,7 +1675,7 @@ sourceFile:file4.ts "pos": 0, "end": 4158, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 0, @@ -1697,7 +1697,7 @@ sourceFile:file4.ts "pos": 0, "end": 217, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -1721,7 +1721,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (0-4158):: /src/lib/module.js texts:: 1 +prepend: (0-4158):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (0-4158) /*@internal*/ var myGlob = 20; @@ -1841,7 +1841,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-217):: /src/lib/module.d.ts texts:: 1 +prepend: (0-217):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-217) declare module "file1" { @@ -3500,12 +3500,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js index 3f54094bbb415..ece0a5fc25abf 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js @@ -297,10 +297,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -308,7 +308,7 @@ sourceFile:file4.ts "pos": 0, "end": 513, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 0, @@ -342,7 +342,7 @@ sourceFile:file4.ts "pos": 89, "end": 297, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 89, @@ -366,7 +366,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (0-513):: /src/lib/module.js texts:: 1 +prepend: (0-513):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (0-513) /// @@ -406,7 +406,7 @@ reference: (0-39):: tripleRef.d.ts reference: (41-87):: ../lib/tripleRef.d.ts /// ---------------------------------------------------------------------- -prepend: (89-297):: /src/lib/module.d.ts texts:: 1 +prepend: (89-297):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (89-297) declare const file0Const: libfile0; @@ -634,12 +634,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js index dd4ab0b77fd59..6c9be3154a560 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js @@ -532,10 +532,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -561,7 +561,7 @@ sourceFile:file4.ts "pos": 1180, "end": 1821, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 1180, @@ -590,7 +590,7 @@ sourceFile:file4.ts "pos": 0, "end": 227, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -651,7 +651,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (1180-1821):: /src/lib/module.js texts:: 1 +prepend: (1180-1821):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1821) var myGlob = 20; @@ -698,7 +698,7 @@ appfile4Spread.apply(void 0, __spread([10, 20, 30])); ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-227):: /src/lib/module.d.ts texts:: 1 +prepend: (0-227):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-227) declare const myGlob = 20; @@ -1022,12 +1022,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js index cf4206dd92edc..df3412c267c64 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js @@ -469,10 +469,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -504,7 +504,7 @@ sourceFile:file4.ts "pos": 62, "end": 514, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 62, @@ -554,7 +554,7 @@ sourceFile:file4.ts "pos": 0, "end": 171, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -590,7 +590,7 @@ prologue: (30-44):: myPrologue3 prologue: (46-60):: myPrologue2 "myPrologue2"; ---------------------------------------------------------------------- -prepend: (62-514):: /src/lib/module.js texts:: 1 +prepend: (62-514):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (62-514) var myGlob = 20; @@ -622,7 +622,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-171):: /src/lib/module.d.ts texts:: 1 +prepend: (0-171):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-171) declare const myGlob = 20; @@ -972,12 +972,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/stripInternal.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/stripInternal.js index 5d966ce119e9d..1c8bad6c40a1d 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/stripInternal.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/stripInternal.js @@ -1844,10 +1844,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -1855,7 +1855,7 @@ sourceFile:file4.ts "pos": 0, "end": 4143, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 0, @@ -1877,7 +1877,7 @@ sourceFile:file4.ts "pos": 0, "end": 191, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -1901,7 +1901,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (0-4143):: /src/lib/module.js texts:: 1 +prepend: (0-4143):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (0-4143) /*@internal*/ var myGlob = 20; @@ -2020,7 +2020,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-191):: /src/lib/module.d.ts texts:: 1 +prepend: (0-191):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-191) declare module "file1" { @@ -4365,12 +4365,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/modules-and-globals-mixed-in-amd.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/modules-and-globals-mixed-in-amd.js index 8ed340ba812dc..4106601d1e374 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/modules-and-globals-mixed-in-amd.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/modules-and-globals-mixed-in-amd.js @@ -380,10 +380,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -391,7 +391,7 @@ sourceFile:file4.ts "pos": 0, "end": 409, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 0, @@ -413,7 +413,7 @@ sourceFile:file4.ts "pos": 0, "end": 171, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -437,7 +437,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (0-409):: /src/lib/module.js texts:: 1 +prepend: (0-409):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (0-409) var myGlob = 20; @@ -466,7 +466,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-171):: /src/lib/module.d.ts texts:: 1 +prepend: (0-171):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-171) declare const myGlob = 20; @@ -753,12 +753,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/multiple-emitHelpers-in-all-projects.js index 52b1fff83030c..eeb57b9cf9e56 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/multiple-emitHelpers-in-all-projects.js @@ -826,10 +826,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -855,7 +855,7 @@ sourceFile:file4.ts "pos": 1180, "end": 1906, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 1180, @@ -884,7 +884,7 @@ sourceFile:file4.ts "pos": 0, "end": 227, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -945,7 +945,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (1180-1906):: /src/lib/module.js texts:: 1 +prepend: (1180-1906):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1906) var myGlob = 20; @@ -994,7 +994,7 @@ appfile4Spread.apply(void 0, __spread([10, 20, 30])); ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-227):: /src/lib/module.d.ts texts:: 1 +prepend: (0-227):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-227) declare const myGlob = 20; @@ -1560,12 +1560,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/multiple-prologues-in-all-projects.js index b02bd3eda8756..4835019b1f977 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/multiple-prologues-in-all-projects.js @@ -478,10 +478,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -513,7 +513,7 @@ sourceFile:file4.ts "pos": 62, "end": 494, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 62, @@ -563,7 +563,7 @@ sourceFile:file4.ts "pos": 0, "end": 171, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -599,7 +599,7 @@ prologue: (30-44):: myPrologue3 prologue: (46-60):: myPrologue2 "myPrologue2"; ---------------------------------------------------------------------- -prepend: (62-494):: /src/lib/module.js texts:: 1 +prepend: (62-494):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (62-494) var myGlob = 20; @@ -630,7 +630,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-171):: /src/lib/module.d.ts texts:: 1 +prepend: (0-171):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-171) declare const myGlob = 20; @@ -1001,12 +1001,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/shebang-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/shebang-in-all-projects.js index 879886a65657e..eb0407a5b1766 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/shebang-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/shebang-in-all-projects.js @@ -395,10 +395,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -406,7 +406,7 @@ sourceFile:file4.ts "pos": 25, "end": 434, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 25, @@ -428,7 +428,7 @@ sourceFile:file4.ts "pos": 25, "end": 196, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 25, @@ -452,7 +452,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (25-434):: /src/lib/module.js texts:: 1 +prepend: (25-434):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (25-434) var myGlob = 20; @@ -481,7 +481,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (25-196):: /src/lib/module.d.ts texts:: 1 +prepend: (25-196):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (25-196) declare const myGlob = 20; @@ -784,12 +784,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/stripInternal.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/stripInternal.js index cc6e0679812ad..dcac12cae9f3b 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/stripInternal.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/stripInternal.js @@ -1863,10 +1863,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -1874,7 +1874,7 @@ sourceFile:file4.ts "pos": 0, "end": 4129, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 0, @@ -1896,7 +1896,7 @@ sourceFile:file4.ts "pos": 0, "end": 217, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -1920,7 +1920,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (0-4129):: /src/lib/module.js texts:: 1 +prepend: (0-4129):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (0-4129) /*@internal*/ var myGlob = 20; @@ -2039,7 +2039,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-217):: /src/lib/module.d.ts texts:: 1 +prepend: (0-217):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-217) declare module "file1" { @@ -4457,12 +4457,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/triple-slash-refs-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/triple-slash-refs-in-all-projects.js index 43e85f88471a3..30f8da909cdc2 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/triple-slash-refs-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/triple-slash-refs-in-all-projects.js @@ -511,10 +511,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -522,7 +522,7 @@ sourceFile:file4.ts "pos": 0, "end": 484, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 0, @@ -556,7 +556,7 @@ sourceFile:file4.ts "pos": 89, "end": 297, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 89, @@ -580,7 +580,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (0-484):: /src/lib/module.js texts:: 1 +prepend: (0-484):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (0-484) /// @@ -619,7 +619,7 @@ reference: (0-39):: tripleRef.d.ts reference: (41-87):: ../lib/tripleRef.d.ts /// ---------------------------------------------------------------------- -prepend: (89-297):: /src/lib/module.d.ts texts:: 1 +prepend: (89-297):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (89-297) declare const file0Const: libfile0; @@ -979,12 +979,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/when-the-module-resolution-finds-original-source-file.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/when-the-module-resolution-finds-original-source-file.js index 119eb04f23ac6..3fdb37efb3a76 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/when-the-module-resolution-finds-original-source-file.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/when-the-module-resolution-finds-original-source-file.js @@ -385,10 +385,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -396,7 +396,7 @@ sourceFile:file4.ts "pos": 0, "end": 417, "kind": "prepend", - "data": "/src/module.js", + "data": "../module.js", "texts": [ { "pos": 0, @@ -418,7 +418,7 @@ sourceFile:file4.ts "pos": 0, "end": 179, "kind": "prepend", - "data": "/src/module.d.ts", + "data": "../module.d.ts", "texts": [ { "pos": 0, @@ -442,7 +442,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (0-417):: /src/module.js texts:: 1 +prepend: (0-417):: ../module.js texts:: 1 >>-------------------------------------------------------------------- text: (0-417) var myGlob = 20; @@ -471,7 +471,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-179):: /src/module.d.ts texts:: 1 +prepend: (0-179):: ../module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-179) declare const myGlob = 20; @@ -542,12 +542,12 @@ var globalConst = 10; //// [/src/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./lib/file0.ts", + "./lib/file1.ts", + "./lib/file2.ts", + "./lib/global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/baseline-sectioned-sourcemaps.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/baseline-sectioned-sourcemaps.js index 76213f9b6cead..b8705b1b03d06 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/baseline-sectioned-sourcemaps.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/baseline-sectioned-sourcemaps.js @@ -301,11 +301,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1109,9 +1109,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1119,7 +1119,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 109, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1132,7 +1132,7 @@ sourceFile:../../third_part1.ts "pos": 109, "end": 394, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 109, @@ -1154,7 +1154,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 156, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1167,7 +1167,7 @@ sourceFile:../../third_part1.ts "pos": 156, "end": 256, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 156, @@ -1191,7 +1191,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-109):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-109):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-109) var s = "Hola, world"; @@ -1202,7 +1202,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (109-394):: /src/2/second-output.js texts:: 1 +prepend: (109-394):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (109-394) var N; @@ -1230,7 +1230,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-156):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-156):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-156) interface TheFirst { @@ -1243,7 +1243,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (156-256):: /src/2/second-output.d.ts texts:: 1 +prepend: (156-256):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (156-256) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/emitHelpers-in-all-projects.js index 6271da6473a36..f3a11792c1ff5 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/emitHelpers-in-all-projects.js @@ -396,11 +396,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1472,9 +1472,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1488,7 +1488,7 @@ sourceFile:../../third_part1.ts "pos": 502, "end": 728, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 502, @@ -1501,7 +1501,7 @@ sourceFile:../../third_part1.ts "pos": 728, "end": 1132, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 728, @@ -1528,7 +1528,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 207, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1541,7 +1541,7 @@ sourceFile:../../third_part1.ts "pos": 207, "end": 360, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 207, @@ -1578,7 +1578,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (502-728):: /src/first/bin/first-output.js texts:: 1 +prepend: (502-728):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (502-728) var s = "Hola, world"; @@ -1592,7 +1592,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (728-1132):: /src/2/second-output.js texts:: 1 +prepend: (728-1132):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (728-1132) var N; @@ -1626,7 +1626,7 @@ function forthirdthird_part1Rest() { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-207):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-207):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-207) interface TheFirst { @@ -1640,7 +1640,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (207-360):: /src/2/second-output.d.ts texts:: 1 +prepend: (207-360):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (207-360) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/multiple-prologues-in-all-projects.js index 253fe2963c756..3b3e6b136dc24 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/multiple-prologues-in-all-projects.js @@ -318,11 +318,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1236,9 +1236,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1270,7 +1270,7 @@ sourceFile:../../third_part1.ts "pos": 62, "end": 171, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 62, @@ -1283,7 +1283,7 @@ sourceFile:../../third_part1.ts "pos": 171, "end": 456, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 171, @@ -1342,7 +1342,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 156, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1355,7 +1355,7 @@ sourceFile:../../third_part1.ts "pos": 156, "end": 256, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 156, @@ -1391,7 +1391,7 @@ prologue: (30-44):: myPrologue2 prologue: (46-60):: myPrologue3 "myPrologue3"; ---------------------------------------------------------------------- -prepend: (62-171):: /src/first/bin/first-output.js texts:: 1 +prepend: (62-171):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (62-171) var s = "Hola, world"; @@ -1402,7 +1402,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (171-456):: /src/2/second-output.js texts:: 1 +prepend: (171-456):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (171-456) var N; @@ -1430,7 +1430,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-156):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-156):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-156) interface TheFirst { @@ -1443,7 +1443,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (156-256):: /src/2/second-output.d.ts texts:: 1 +prepend: (156-256):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (156-256) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/shebang-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/shebang-in-all-projects.js index 1dec0c6adfc5a..5dc312d58cebf 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/shebang-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/shebang-in-all-projects.js @@ -308,11 +308,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1128,9 +1128,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1138,7 +1138,7 @@ sourceFile:../../third_part1.ts "pos": 33, "end": 142, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 33, @@ -1151,7 +1151,7 @@ sourceFile:../../third_part1.ts "pos": 142, "end": 427, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 142, @@ -1173,7 +1173,7 @@ sourceFile:../../third_part1.ts "pos": 33, "end": 189, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 33, @@ -1186,7 +1186,7 @@ sourceFile:../../third_part1.ts "pos": 189, "end": 289, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 189, @@ -1210,7 +1210,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (33-142):: /src/first/bin/first-output.js texts:: 1 +prepend: (33-142):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (33-142) var s = "Hola, world"; @@ -1221,7 +1221,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (142-427):: /src/2/second-output.js texts:: 1 +prepend: (142-427):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (142-427) var N; @@ -1249,7 +1249,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (33-189):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (33-189):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (33-189) interface TheFirst { @@ -1262,7 +1262,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (189-289):: /src/2/second-output.d.ts texts:: 1 +prepend: (189-289):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (189-289) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/strict-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/strict-in-all-projects.js index f0a326a6b6634..84d8de40064be 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/strict-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/strict-in-all-projects.js @@ -303,11 +303,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1141,9 +1141,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1157,7 +1157,7 @@ sourceFile:../../third_part1.ts "pos": 15, "end": 124, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 15, @@ -1170,7 +1170,7 @@ sourceFile:../../third_part1.ts "pos": 124, "end": 409, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 124, @@ -1211,7 +1211,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 156, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1224,7 +1224,7 @@ sourceFile:../../third_part1.ts "pos": 156, "end": 256, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 156, @@ -1251,7 +1251,7 @@ File:: /src/third/thirdjs/output/third-output.js prologue: (0-13):: use strict "use strict"; ---------------------------------------------------------------------- -prepend: (15-124):: /src/first/bin/first-output.js texts:: 1 +prepend: (15-124):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (15-124) var s = "Hola, world"; @@ -1262,7 +1262,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (124-409):: /src/2/second-output.js texts:: 1 +prepend: (124-409):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (124-409) var N; @@ -1290,7 +1290,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-156):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-156):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-156) interface TheFirst { @@ -1303,7 +1303,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (156-256):: /src/2/second-output.d.ts texts:: 1 +prepend: (156-256):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (156-256) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal-when-one-two-three-are-prepended-in-order.js index c82ee4e581b27..0b7ac11a1009b 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -2540,10 +2540,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2551,7 +2551,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 109, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2573,7 +2573,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 156, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2632,7 +2632,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-109):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-109):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-109) var s = "Hola, world"; @@ -2751,7 +2751,7 @@ var C = (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-156):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-156):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-39) interface TheFirst { @@ -3141,11 +3141,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -5257,9 +5257,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -5267,7 +5267,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3161, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -5289,7 +5289,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 275, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -5313,7 +5313,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3161):: /src/2/second-output.js texts:: 1 +prepend: (0-3161):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3161) var s = "Hola, world"; @@ -5434,7 +5434,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-275):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-275):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-275) declare const s = "Hola, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal.js index b7f8e605cc87c..031180b66ce13 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal.js @@ -301,11 +301,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2417,9 +2417,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2427,7 +2427,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 109, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2440,7 +2440,7 @@ sourceFile:../../third_part1.ts "pos": 109, "end": 3161, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 109, @@ -2462,7 +2462,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 115, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2475,7 +2475,7 @@ sourceFile:../../third_part1.ts "pos": 115, "end": 275, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 115, @@ -2499,7 +2499,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-109):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-109):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-109) var s = "Hola, world"; @@ -2510,7 +2510,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (109-3161):: /src/2/second-output.js texts:: 1 +prepend: (109-3161):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (109-3161) var N; @@ -2625,7 +2625,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-115):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-115):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-115) declare const s = "Hola, world"; @@ -2635,7 +2635,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (115-275):: /src/2/second-output.d.ts texts:: 1 +prepend: (115-275):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (115-275) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/triple-slash-refs-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/triple-slash-refs-in-all-projects.js index 19f2c6e32b11a..837220d8dd11b 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/triple-slash-refs-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/triple-slash-refs-in-all-projects.js @@ -358,11 +358,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1343,9 +1343,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1353,7 +1353,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1366,7 +1366,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 493, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 157, @@ -1406,7 +1406,7 @@ sourceFile:../../third_part1.ts "pos": 160, "end": 367, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 160, @@ -1419,7 +1419,7 @@ sourceFile:../../third_part1.ts "pos": 367, "end": 521, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 367, @@ -1443,7 +1443,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-157) var s = "Hola, world"; @@ -1455,7 +1455,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (157-493):: /src/2/second-output.js texts:: 1 +prepend: (157-493):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (157-493) var second_part1Const = new secondsecond_part1(); @@ -1494,7 +1494,7 @@ reference: (47-101):: ../../../first/tripleRef.d.ts reference: (103-158):: ../../../second/tripleRef.d.ts /// ---------------------------------------------------------------------- -prepend: (160-367):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (160-367):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (160-367) interface TheFirst { @@ -1508,7 +1508,7 @@ declare const first_part2Const: firstfirst_part2; declare function f(): string; ---------------------------------------------------------------------- -prepend: (367-521):: /src/2/second-output.d.ts texts:: 1 +prepend: (367-521):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (367-521) declare const second_part1Const: secondsecond_part1; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/baseline-sectioned-sourcemaps.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/baseline-sectioned-sourcemaps.js index dd6014382123e..de8f6f9b0dbc2 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/baseline-sectioned-sourcemaps.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/baseline-sectioned-sourcemaps.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -760,9 +760,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -770,7 +770,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -783,7 +783,7 @@ sourceFile:../../third_part1.ts "pos": 127, "end": 412, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 127, @@ -805,7 +805,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -818,7 +818,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -842,7 +842,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -854,7 +854,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (127-412):: /src/2/second-output.js texts:: 1 +prepend: (127-412):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (127-412) var N; @@ -882,7 +882,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -895,7 +895,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-all-projects.js index 828d013c259b4..2c8eeceeac3de 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-all-projects.js @@ -260,11 +260,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1044,9 +1044,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1060,7 +1060,7 @@ sourceFile:../../third_part1.ts "pos": 502, "end": 746, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 502, @@ -1073,7 +1073,7 @@ sourceFile:../../third_part1.ts "pos": 746, "end": 1150, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 746, @@ -1100,7 +1100,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1113,7 +1113,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 361, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -1150,7 +1150,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (502-746):: /src/first/bin/first-output.js texts:: 1 +prepend: (502-746):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (502-746) var s = "Hello, world"; @@ -1165,7 +1165,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (746-1150):: /src/2/second-output.js texts:: 1 +prepend: (746-1150):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (746-1150) var N; @@ -1199,7 +1199,7 @@ function forthirdthird_part1Rest() { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -1213,7 +1213,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-361):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-361):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-361) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-only-one-dependency-project.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-only-one-dependency-project.js index 44e22ae289e7d..80c79449ce1a9 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-only-one-dependency-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-only-one-dependency-project.js @@ -204,11 +204,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -873,9 +873,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -889,7 +889,7 @@ sourceFile:../../third_part1.ts "pos": 502, "end": 669, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 502, @@ -902,7 +902,7 @@ sourceFile:../../third_part1.ts "pos": 669, "end": 1073, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 669, @@ -924,7 +924,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -937,7 +937,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 361, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -974,7 +974,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (502-669):: /src/first/bin/first-output.js texts:: 1 +prepend: (502-669):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (502-669) var s = "Hello, world"; @@ -987,7 +987,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (669-1073):: /src/2/second-output.js texts:: 1 +prepend: (669-1073):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (669-1073) var N; @@ -1018,7 +1018,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -1032,7 +1032,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-361):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-361):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-361) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js index 2efa78454c035..9a1d94824d4fe 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js @@ -402,11 +402,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1579,9 +1579,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1607,7 +1607,7 @@ sourceFile:../../third_part1.ts "pos": 1180, "end": 1636, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 1180, @@ -1620,7 +1620,7 @@ sourceFile:../../third_part1.ts "pos": 1636, "end": 2256, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 1636, @@ -1649,7 +1649,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 272, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1662,7 +1662,7 @@ sourceFile:../../third_part1.ts "pos": 272, "end": 491, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 272, @@ -1723,7 +1723,7 @@ var __spread = (this && this.__spread) || function () { return ar; }; ---------------------------------------------------------------------- -prepend: (1180-1636):: /src/first/bin/first-output.js texts:: 1 +prepend: (1180-1636):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1636) var s = "Hello, world"; @@ -1745,7 +1745,7 @@ function firstfirst_part3Spread() { firstfirst_part3Spread.apply(void 0, __spread([10, 20, 30])); ---------------------------------------------------------------------- -prepend: (1636-2256):: /src/2/second-output.js texts:: 1 +prepend: (1636-2256):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1636-2256) var N; @@ -1793,7 +1793,7 @@ thirdthird_part1Spread.apply(void 0, __spread([10, 20, 30])); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-272):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-272):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-272) interface TheFirst { @@ -1808,7 +1808,7 @@ declare function f(): string; declare function firstfirst_part3Spread(...b: number[]): void; ---------------------------------------------------------------------- -prepend: (272-491):: /src/2/second-output.d.ts texts:: 1 +prepend: (272-491):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (272-491) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-different-projects.js index fc441e6a91904..5a6d733931e94 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-different-projects.js @@ -260,11 +260,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1134,9 +1134,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1162,7 +1162,7 @@ sourceFile:../../third_part1.ts "pos": 1180, "end": 1424, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 1180, @@ -1175,7 +1175,7 @@ sourceFile:../../third_part1.ts "pos": 1424, "end": 1925, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 1424, @@ -1202,7 +1202,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1215,7 +1215,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 374, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -1276,7 +1276,7 @@ var __spread = (this && this.__spread) || function () { return ar; }; ---------------------------------------------------------------------- -prepend: (1180-1424):: /src/first/bin/first-output.js texts:: 1 +prepend: (1180-1424):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1424) var s = "Hello, world"; @@ -1291,7 +1291,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (1424-1925):: /src/2/second-output.js texts:: 1 +prepend: (1424-1925):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1424-1925) var N; @@ -1329,7 +1329,7 @@ function forthirdthird_part1Rest() { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -1343,7 +1343,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-374):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-374):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-374) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js index 35873e9538839..c8eae0ea27277 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js @@ -202,11 +202,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -881,9 +881,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -915,7 +915,7 @@ sourceFile:../../third_part1.ts "pos": 62, "end": 189, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 62, @@ -928,7 +928,7 @@ sourceFile:../../third_part1.ts "pos": 189, "end": 474, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 189, @@ -987,7 +987,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1000,7 +1000,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1036,7 +1036,7 @@ prologue: (30-44):: myPrologue2 prologue: (46-60):: myPrologue3 "myPrologue3"; ---------------------------------------------------------------------- -prepend: (62-189):: /src/first/bin/first-output.js texts:: 1 +prepend: (62-189):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (62-189) var s = "Hello, world"; @@ -1048,7 +1048,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (189-474):: /src/2/second-output.js texts:: 1 +prepend: (189-474):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (189-474) var N; @@ -1076,7 +1076,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1089,7 +1089,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-different-projects.js index b4c18d1902926..cbf38cf064288 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-different-projects.js @@ -188,11 +188,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -828,9 +828,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -856,7 +856,7 @@ sourceFile:../../third_part1.ts "pos": 46, "end": 173, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 46, @@ -869,7 +869,7 @@ sourceFile:../../third_part1.ts "pos": 173, "end": 458, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 173, @@ -910,7 +910,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -923,7 +923,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -956,7 +956,7 @@ prologue: (15-28):: myPrologue prologue: (30-44):: myPrologue2 "myPrologue2"; ---------------------------------------------------------------------- -prepend: (46-173):: /src/first/bin/first-output.js texts:: 1 +prepend: (46-173):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (46-173) var s = "Hello, world"; @@ -968,7 +968,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (173-458):: /src/2/second-output.js texts:: 1 +prepend: (173-458):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (173-458) var N; @@ -996,7 +996,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1009,7 +1009,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-all-projects.js index 6bfe067b159a3..b0c4c820ac266 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-all-projects.js @@ -190,11 +190,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -771,9 +771,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -781,7 +781,7 @@ sourceFile:../../third_part1.ts "pos": 33, "end": 160, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 33, @@ -794,7 +794,7 @@ sourceFile:../../third_part1.ts "pos": 160, "end": 445, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 160, @@ -816,7 +816,7 @@ sourceFile:../../third_part1.ts "pos": 33, "end": 190, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 33, @@ -829,7 +829,7 @@ sourceFile:../../third_part1.ts "pos": 190, "end": 290, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 190, @@ -853,7 +853,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (33-160):: /src/first/bin/first-output.js texts:: 1 +prepend: (33-160):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (33-160) var s = "Hello, world"; @@ -865,7 +865,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (160-445):: /src/2/second-output.js texts:: 1 +prepend: (160-445):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (160-445) var N; @@ -893,7 +893,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (33-190):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (33-190):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (33-190) interface TheFirst { @@ -906,7 +906,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (190-290):: /src/2/second-output.d.ts texts:: 1 +prepend: (190-290):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (190-290) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-only-one-dependency-project.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-only-one-dependency-project.js index 3f8540c42d4c5..d89f565e37593 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-only-one-dependency-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-only-one-dependency-project.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -763,9 +763,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -773,7 +773,7 @@ sourceFile:../../third_part1.ts "pos": 35, "end": 162, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 35, @@ -786,7 +786,7 @@ sourceFile:../../third_part1.ts "pos": 162, "end": 447, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 162, @@ -808,7 +808,7 @@ sourceFile:../../third_part1.ts "pos": 35, "end": 192, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 35, @@ -821,7 +821,7 @@ sourceFile:../../third_part1.ts "pos": 192, "end": 292, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 192, @@ -845,7 +845,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (35-162):: /src/first/bin/first-output.js texts:: 1 +prepend: (35-162):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (35-162) var s = "Hello, world"; @@ -857,7 +857,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (162-447):: /src/2/second-output.js texts:: 1 +prepend: (162-447):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (162-447) var N; @@ -885,7 +885,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (35-192):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (35-192):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (35-192) interface TheFirst { @@ -898,7 +898,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (192-292):: /src/2/second-output.d.ts texts:: 1 +prepend: (192-292):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (192-292) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-all-projects.js index 6258dd97d2544..5cf3ea7abd422 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-all-projects.js @@ -188,11 +188,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -792,9 +792,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -808,7 +808,7 @@ sourceFile:../../third_part1.ts "pos": 15, "end": 142, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 15, @@ -821,7 +821,7 @@ sourceFile:../../third_part1.ts "pos": 142, "end": 427, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 142, @@ -862,7 +862,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -875,7 +875,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -902,7 +902,7 @@ File:: /src/third/thirdjs/output/third-output.js prologue: (0-13):: use strict "use strict"; ---------------------------------------------------------------------- -prepend: (15-142):: /src/first/bin/first-output.js texts:: 1 +prepend: (15-142):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (15-142) var s = "Hello, world"; @@ -914,7 +914,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (142-427):: /src/2/second-output.js texts:: 1 +prepend: (142-427):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (142-427) var N; @@ -942,7 +942,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -955,7 +955,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-one-dependency.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-one-dependency.js index ca03930150c69..372ef6719104d 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-one-dependency.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-one-dependency.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -762,9 +762,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -778,7 +778,7 @@ sourceFile:../../third_part1.ts "pos": 15, "end": 142, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 15, @@ -791,7 +791,7 @@ sourceFile:../../third_part1.ts "pos": 142, "end": 427, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 142, @@ -813,7 +813,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -826,7 +826,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -853,7 +853,7 @@ File:: /src/third/thirdjs/output/third-output.js prologue: (0-13):: use strict "use strict"; ---------------------------------------------------------------------- -prepend: (15-142):: /src/first/bin/first-output.js texts:: 1 +prepend: (15-142):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (15-142) var s = "Hello, world"; @@ -865,7 +865,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (142-427):: /src/2/second-output.js texts:: 1 +prepend: (142-427):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (142-427) var N; @@ -893,7 +893,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -906,7 +906,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js index d1b45613c2e78..d9691fde1a8f6 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js @@ -1725,10 +1725,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -1736,7 +1736,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1758,7 +1758,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1817,7 +1817,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -1937,7 +1937,7 @@ var C = (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-39) interface TheFirst { @@ -2212,11 +2212,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -4072,9 +4072,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -4082,7 +4082,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3179, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -4104,7 +4104,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -4128,7 +4128,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3179):: /src/2/second-output.js texts:: 1 +prepend: (0-3179):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3179) var s = "Hello, world"; @@ -4250,7 +4250,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-276) declare const s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment.js index 764219107a97f..38403c4693d02 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2046,9 +2046,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2056,7 +2056,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2069,7 +2069,7 @@ sourceFile:../../third_part1.ts "pos": 127, "end": 3179, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 127, @@ -2091,7 +2091,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 116, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2104,7 +2104,7 @@ sourceFile:../../third_part1.ts "pos": 116, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 116, @@ -2128,7 +2128,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -2140,7 +2140,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (127-3179):: /src/2/second-output.js texts:: 1 +prepend: (127-3179):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (127-3179) var N; @@ -2255,7 +2255,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-116):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-116):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-116) declare const s = "Hello, world"; @@ -2265,7 +2265,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (116-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (116-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (116-276) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index beb2d1cc67a1c..a48020f4ba74b 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -1825,10 +1825,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -1836,7 +1836,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1858,7 +1858,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 172, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1917,7 +1917,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -2037,7 +2037,7 @@ var C = /** @class */ (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-172):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-172):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-54) /**@internal*/ interface TheFirst { @@ -2312,11 +2312,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -4272,9 +4272,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -4282,7 +4282,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3561, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -4304,7 +4304,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -4328,7 +4328,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3561):: /src/2/second-output.js texts:: 1 +prepend: (0-3561):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3561) var s = "Hello, world"; @@ -4450,7 +4450,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-276) declare const s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled.js index 6b82b8598bea2..29ad265d6ab55 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2146,9 +2146,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2156,7 +2156,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2169,7 +2169,7 @@ sourceFile:../../third_part1.ts "pos": 127, "end": 3561, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 127, @@ -2191,7 +2191,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 116, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2204,7 +2204,7 @@ sourceFile:../../third_part1.ts "pos": 116, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 116, @@ -2228,7 +2228,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -2240,7 +2240,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (127-3561):: /src/2/second-output.js texts:: 1 +prepend: (127-3561):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (127-3561) var N; @@ -2355,7 +2355,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-116):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-116):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-116) declare const s = "Hello, world"; @@ -2365,7 +2365,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (116-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (116-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (116-276) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-when-one-two-three-are-prepended-in-order.js index 564e08a5e388d..08a0bffd148e2 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -1725,10 +1725,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -1736,7 +1736,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1758,7 +1758,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1817,7 +1817,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -1937,7 +1937,7 @@ var C = (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-39) interface TheFirst { @@ -2212,11 +2212,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -4072,9 +4072,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -4082,7 +4082,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3179, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -4104,7 +4104,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -4128,7 +4128,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3179):: /src/2/second-output.js texts:: 1 +prepend: (0-3179):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3179) var s = "Hello, world"; @@ -4250,7 +4250,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-276) declare const s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index eeb8407c88118..e17e3f05842dd 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -1825,10 +1825,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -1836,7 +1836,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1858,7 +1858,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1917,7 +1917,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -2037,7 +2037,7 @@ var C = /** @class */ (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-39) interface TheFirst { @@ -2312,11 +2312,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -4272,9 +4272,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -4282,7 +4282,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3543, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -4304,7 +4304,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -4328,7 +4328,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3543):: /src/2/second-output.js texts:: 1 +prepend: (0-3543):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3543) var s = "Hello, world"; @@ -4450,7 +4450,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-276) declare const s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled.js index 9dd8185be7d29..29c643c43f573 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2146,9 +2146,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2156,7 +2156,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2169,7 +2169,7 @@ sourceFile:../../third_part1.ts "pos": 127, "end": 3543, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 127, @@ -2191,7 +2191,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 116, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2204,7 +2204,7 @@ sourceFile:../../third_part1.ts "pos": 116, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 116, @@ -2228,7 +2228,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -2240,7 +2240,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (127-3543):: /src/2/second-output.js texts:: 1 +prepend: (127-3543):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (127-3543) var N; @@ -2355,7 +2355,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-116):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-116):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-116) declare const s = "Hello, world"; @@ -2365,7 +2365,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (116-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (116-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (116-276) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal.js index 8b4b41c6ae760..e91c046c27870 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2046,9 +2046,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2056,7 +2056,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2069,7 +2069,7 @@ sourceFile:../../third_part1.ts "pos": 127, "end": 3179, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 127, @@ -2091,7 +2091,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 116, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2104,7 +2104,7 @@ sourceFile:../../third_part1.ts "pos": 116, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 116, @@ -2128,7 +2128,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -2140,7 +2140,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (127-3179):: /src/2/second-output.js texts:: 1 +prepend: (127-3179):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (127-3179) var N; @@ -2255,7 +2255,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-116):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-116):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-116) declare const s = "Hello, world"; @@ -2265,7 +2265,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (116-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (116-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (116-276) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js index 1b9ced8b498da..a7e041fe565eb 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js @@ -215,11 +215,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -887,9 +887,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -897,7 +897,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 175, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -910,7 +910,7 @@ sourceFile:../../third_part1.ts "pos": 175, "end": 511, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 175, @@ -950,7 +950,7 @@ sourceFile:../../third_part1.ts "pos": 160, "end": 368, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 160, @@ -963,7 +963,7 @@ sourceFile:../../third_part1.ts "pos": 368, "end": 522, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 368, @@ -987,7 +987,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-175):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-175):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-175) var s = "Hello, world"; @@ -1000,7 +1000,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (175-511):: /src/2/second-output.js texts:: 1 +prepend: (175-511):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (175-511) var second_part1Const = new secondsecond_part1(); @@ -1039,7 +1039,7 @@ reference: (47-101):: ../../../first/tripleRef.d.ts reference: (103-158):: ../../../second/tripleRef.d.ts /// ---------------------------------------------------------------------- -prepend: (160-368):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (160-368):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (160-368) interface TheFirst { @@ -1053,7 +1053,7 @@ declare const first_part2Const: firstfirst_part2; declare function f(): string; ---------------------------------------------------------------------- -prepend: (368-522):: /src/2/second-output.d.ts texts:: 1 +prepend: (368-522):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (368-522) declare const second_part1Const: secondsecond_part1; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-one-project.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-one-project.js index 9b459e7469e20..c34e752d8086d 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-one-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-one-project.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -789,9 +789,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -799,7 +799,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -812,7 +812,7 @@ sourceFile:../../third_part1.ts "pos": 127, "end": 463, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 127, @@ -840,7 +840,7 @@ sourceFile:../../third_part1.ts "pos": 57, "end": 214, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 57, @@ -853,7 +853,7 @@ sourceFile:../../third_part1.ts "pos": 214, "end": 368, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 214, @@ -877,7 +877,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -889,7 +889,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (127-463):: /src/2/second-output.js texts:: 1 +prepend: (127-463):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (127-463) var second_part1Const = new secondsecond_part1(); @@ -921,7 +921,7 @@ File:: /src/third/thirdjs/output/third-output.d.ts reference: (0-55):: ../../../second/tripleRef.d.ts /// ---------------------------------------------------------------------- -prepend: (57-214):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (57-214):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (57-214) interface TheFirst { @@ -934,7 +934,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (214-368):: /src/2/second-output.d.ts texts:: 1 +prepend: (214-368):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (214-368) declare const second_part1Const: secondsecond_part1; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-final-project-is-not-composite-but-uses-project-references.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-final-project-is-not-composite-but-uses-project-references.js index 877978909605d..eb117294ec4a2 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-final-project-is-not-composite-but-uses-project-references.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-final-project-is-not-composite-but-uses-project-references.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-source-files-are-empty-in-the-own-file.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-source-files-are-empty-in-the-own-file.js index e74c0b0fe6f2e..d050ca2dd0c70 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-source-files-are-empty-in-the-own-file.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-source-files-are-empty-in-the-own-file.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -705,9 +705,9 @@ sourceFile:../../../second/second_part2.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -715,7 +715,7 @@ sourceFile:../../../second/second_part2.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -728,7 +728,7 @@ sourceFile:../../../second/second_part2.ts "pos": 127, "end": 412, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 127, @@ -745,7 +745,7 @@ sourceFile:../../../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -758,7 +758,7 @@ sourceFile:../../../second/second_part2.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -777,7 +777,7 @@ sourceFile:../../../second/second_part2.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -789,7 +789,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (127-412):: /src/2/second-output.js texts:: 1 +prepend: (127-412):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (127-412) var N; @@ -812,7 +812,7 @@ var C = (function () { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -825,7 +825,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-all-projects.js index f168d0562a0d6..f595aac719300 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-all-projects.js @@ -326,11 +326,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1316,9 +1316,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1332,7 +1332,7 @@ sourceFile:../../third_part1.ts "pos": 502, "end": 652, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 502, @@ -1345,7 +1345,7 @@ sourceFile:../../third_part1.ts "pos": 652, "end": 1056, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 652, @@ -1372,7 +1372,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1385,7 +1385,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 361, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -1422,7 +1422,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (502-652):: /src/first/bin/first-output.js texts:: 1 +prepend: (502-652):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (502-652) var s = "Hello, world"; @@ -1434,7 +1434,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (652-1056):: /src/2/second-output.js texts:: 1 +prepend: (652-1056):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (652-1056) var N; @@ -1468,7 +1468,7 @@ function forthirdthird_part1Rest() { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -1482,7 +1482,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-361):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-361):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-361) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-only-one-dependency-project.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-only-one-dependency-project.js index d043ab564b2bd..65d56d99c9956 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-only-one-dependency-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-only-one-dependency-project.js @@ -384,11 +384,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1367,9 +1367,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1383,7 +1383,7 @@ sourceFile:../../third_part1.ts "pos": 502, "end": 729, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 502, @@ -1396,7 +1396,7 @@ sourceFile:../../third_part1.ts "pos": 729, "end": 1133, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 729, @@ -1418,7 +1418,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1431,7 +1431,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 361, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -1468,7 +1468,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (502-729):: /src/first/bin/first-output.js texts:: 1 +prepend: (502-729):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (502-729) var s = "Hello, world"; @@ -1482,7 +1482,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (729-1133):: /src/2/second-output.js texts:: 1 +prepend: (729-1133):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (729-1133) var N; @@ -1513,7 +1513,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -1527,7 +1527,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-361):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-361):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-361) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js index eee32672ff5d3..85a0007b0ffbc 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js @@ -498,11 +498,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1978,9 +1978,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2006,7 +2006,7 @@ sourceFile:../../third_part1.ts "pos": 1180, "end": 1542, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 1180, @@ -2019,7 +2019,7 @@ sourceFile:../../third_part1.ts "pos": 1542, "end": 2162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 1542, @@ -2048,7 +2048,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 272, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2061,7 +2061,7 @@ sourceFile:../../third_part1.ts "pos": 272, "end": 491, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 272, @@ -2122,7 +2122,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (1180-1542):: /src/first/bin/first-output.js texts:: 1 +prepend: (1180-1542):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1542) var s = "Hello, world"; @@ -2141,7 +2141,7 @@ function firstfirst_part3Spread() { firstfirst_part3Spread.apply(void 0, __spread([10, 20, 30])); ---------------------------------------------------------------------- -prepend: (1542-2162):: /src/2/second-output.js texts:: 1 +prepend: (1542-2162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1542-2162) var N; @@ -2189,7 +2189,7 @@ thirdthird_part1Spread.apply(void 0, __spread([10, 20, 30])); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-272):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-272):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-272) interface TheFirst { @@ -2204,7 +2204,7 @@ declare function f(): string; declare function firstfirst_part3Spread(...b: number[]): void; ---------------------------------------------------------------------- -prepend: (272-491):: /src/2/second-output.d.ts texts:: 1 +prepend: (272-491):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (272-491) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-different-projects.js index 73bbca16dff64..ea399602b00c9 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-different-projects.js @@ -326,11 +326,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1420,9 +1420,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1448,7 +1448,7 @@ sourceFile:../../third_part1.ts "pos": 1180, "end": 1330, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 1180, @@ -1461,7 +1461,7 @@ sourceFile:../../third_part1.ts "pos": 1330, "end": 1831, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 1330, @@ -1488,7 +1488,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1501,7 +1501,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 374, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -1562,7 +1562,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (1180-1330):: /src/first/bin/first-output.js texts:: 1 +prepend: (1180-1330):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1330) var s = "Hello, world"; @@ -1574,7 +1574,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (1330-1831):: /src/2/second-output.js texts:: 1 +prepend: (1330-1831):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1330-1831) var N; @@ -1612,7 +1612,7 @@ function forthirdthird_part1Rest() { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -1626,7 +1626,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-374):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-374):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-374) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js index 8ac1eaf3e4ea2..948b6e8233a05 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js @@ -321,11 +321,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1254,9 +1254,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1294,7 +1294,7 @@ sourceFile:../../third_part1.ts "pos": 78, "end": 188, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 78, @@ -1307,7 +1307,7 @@ sourceFile:../../third_part1.ts "pos": 188, "end": 473, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 188, @@ -1366,7 +1366,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1379,7 +1379,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1418,7 +1418,7 @@ prologue: (46-60):: myPrologue2 prologue: (62-76):: myPrologue3 "myPrologue3"; ---------------------------------------------------------------------- -prepend: (78-188):: /src/first/bin/first-output.js texts:: 1 +prepend: (78-188):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (78-188) var s = "Hello, world"; @@ -1429,7 +1429,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (188-473):: /src/2/second-output.js texts:: 1 +prepend: (188-473):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (188-473) var N; @@ -1457,7 +1457,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1470,7 +1470,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-different-projects.js index ac6193629843e..f16a24a3fb838 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-different-projects.js @@ -307,11 +307,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1201,9 +1201,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1235,7 +1235,7 @@ sourceFile:../../third_part1.ts "pos": 62, "end": 172, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 62, @@ -1248,7 +1248,7 @@ sourceFile:../../third_part1.ts "pos": 172, "end": 457, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 172, @@ -1289,7 +1289,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1302,7 +1302,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1338,7 +1338,7 @@ prologue: (31-44):: myPrologue prologue: (46-60):: myPrologue2 "myPrologue2"; ---------------------------------------------------------------------- -prepend: (62-172):: /src/first/bin/first-output.js texts:: 1 +prepend: (62-172):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (62-172) var s = "Hello, world"; @@ -1349,7 +1349,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (172-457):: /src/2/second-output.js texts:: 1 +prepend: (172-457):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (172-457) var N; @@ -1377,7 +1377,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1390,7 +1390,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-all-projects.js index 2ce4d57f3dfa8..7e96f8915da31 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-all-projects.js @@ -307,11 +307,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1160,9 +1160,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1182,7 +1182,7 @@ sourceFile:../../third_part1.ts "pos": 30, "end": 140, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 30, @@ -1195,7 +1195,7 @@ sourceFile:../../third_part1.ts "pos": 140, "end": 425, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 140, @@ -1236,7 +1236,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1249,7 +1249,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1279,7 +1279,7 @@ prologue: (0-13):: use strict prologue: (15-28):: myPrologue "myPrologue"; ---------------------------------------------------------------------- -prepend: (30-140):: /src/first/bin/first-output.js texts:: 1 +prepend: (30-140):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (30-140) var s = "Hello, world"; @@ -1290,7 +1290,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (140-425):: /src/2/second-output.js texts:: 1 +prepend: (140-425):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (140-425) var N; @@ -1318,7 +1318,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1331,7 +1331,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-one-dependency.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-one-dependency.js index bb8de6b65e2a7..ebb00b3b84c2f 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-one-dependency.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-one-dependency.js @@ -305,11 +305,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1140,9 +1140,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1162,7 +1162,7 @@ sourceFile:../../third_part1.ts "pos": 30, "end": 140, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 30, @@ -1175,7 +1175,7 @@ sourceFile:../../third_part1.ts "pos": 140, "end": 425, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 140, @@ -1197,7 +1197,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1210,7 +1210,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1240,7 +1240,7 @@ prologue: (0-13):: myPrologue prologue: (15-28):: use strict "use strict"; ---------------------------------------------------------------------- -prepend: (30-140):: /src/first/bin/first-output.js texts:: 1 +prepend: (30-140):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (30-140) var s = "Hello, world"; @@ -1251,7 +1251,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (140-425):: /src/2/second-output.js texts:: 1 +prepend: (140-425):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (140-425) var N; @@ -1279,7 +1279,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1292,7 +1292,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js index 49c3f5329cdec..965863d088eef 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js @@ -2362,10 +2362,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2373,7 +2373,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2395,7 +2395,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2449,7 +2449,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2568,7 +2568,7 @@ var C = (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -2933,11 +2933,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -4963,9 +4963,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -4973,7 +4973,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -4995,7 +4995,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 317, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -5019,7 +5019,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3162):: /src/2/second-output.js texts:: 1 +prepend: (0-3162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3162) var s = "Hello, world"; @@ -5140,7 +5140,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-317):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-317):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-317) interface TheFirst { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment.js index 64068d72eb656..e57ae860e8868 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment.js @@ -278,11 +278,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2308,9 +2308,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2318,7 +2318,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2331,7 +2331,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 3162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -2353,7 +2353,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2366,7 +2366,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 317, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -2390,7 +2390,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2401,7 +2401,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-3162):: /src/2/second-output.js texts:: 1 +prepend: (110-3162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-3162) var N; @@ -2516,7 +2516,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -2529,7 +2529,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-317):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-317):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-317) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-when-one-two-three-are-prepended-in-order.js index 8eeef00c27865..8330077b7b9b7 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -2362,10 +2362,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2373,7 +2373,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2395,7 +2395,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2449,7 +2449,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2568,7 +2568,7 @@ var C = (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -2933,11 +2933,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -4963,9 +4963,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -4973,7 +4973,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -4995,7 +4995,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 317, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -5019,7 +5019,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3162):: /src/2/second-output.js texts:: 1 +prepend: (0-3162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3162) var s = "Hello, world"; @@ -5140,7 +5140,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-317):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-317):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-317) interface TheFirst { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index 75c06d747f5cc..962e2c190993c 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -2462,10 +2462,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2473,7 +2473,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2495,7 +2495,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2549,7 +2549,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2668,7 +2668,7 @@ var C = /** @class */ (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -3033,11 +3033,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -5163,9 +5163,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -5173,7 +5173,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3526, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -5195,7 +5195,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 317, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -5219,7 +5219,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3526):: /src/2/second-output.js texts:: 1 +prepend: (0-3526):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3526) var s = "Hello, world"; @@ -5340,7 +5340,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-317):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-317):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-317) interface TheFirst { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled.js index 0ababa719a18f..fb04c867b4ebe 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled.js @@ -278,11 +278,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2408,9 +2408,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2418,7 +2418,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2431,7 +2431,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 3526, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -2453,7 +2453,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2466,7 +2466,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 317, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -2490,7 +2490,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2501,7 +2501,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-3526):: /src/2/second-output.js texts:: 1 +prepend: (110-3526):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-3526) var N; @@ -2616,7 +2616,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -2629,7 +2629,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-317):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-317):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-317) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal.js index 75b16d6c883e9..4c263d59de860 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal.js @@ -278,11 +278,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2308,9 +2308,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2318,7 +2318,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2331,7 +2331,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 3162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -2353,7 +2353,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2366,7 +2366,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 317, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -2390,7 +2390,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2401,7 +2401,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-3162):: /src/2/second-output.js texts:: 1 +prepend: (110-3162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-3162) var N; @@ -2516,7 +2516,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -2529,7 +2529,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-317):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-317):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-317) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/baseline-sectioned-sourcemaps.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/baseline-sectioned-sourcemaps.js index 7d577643d9092..dc954db7140c1 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/baseline-sectioned-sourcemaps.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/baseline-sectioned-sourcemaps.js @@ -386,10 +386,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -752,11 +752,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1546,9 +1546,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1556,7 +1556,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1569,7 +1569,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 395, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -1591,7 +1591,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1604,7 +1604,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1628,7 +1628,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -1639,7 +1639,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-395):: /src/2/second-output.js texts:: 1 +prepend: (110-395):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-395) var N; @@ -1667,7 +1667,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1680,7 +1680,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/declarationMap-and-sourceMap-disabled.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/declarationMap-and-sourceMap-disabled.js index 2f3656844c27a..71e66236a0a5d 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/declarationMap-and-sourceMap-disabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/declarationMap-and-sourceMap-disabled.js @@ -386,10 +386,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -752,11 +752,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/emitHelpers-in-all-projects.js index 72f24e18ec041..f005ab7855c76 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/emitHelpers-in-all-projects.js @@ -479,10 +479,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -968,11 +968,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2060,9 +2060,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2076,7 +2076,7 @@ sourceFile:../../third_part1.ts "pos": 502, "end": 729, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 502, @@ -2089,7 +2089,7 @@ sourceFile:../../third_part1.ts "pos": 729, "end": 1133, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 729, @@ -2116,7 +2116,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2129,7 +2129,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 361, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -2166,7 +2166,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (502-729):: /src/first/bin/first-output.js texts:: 1 +prepend: (502-729):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (502-729) var s = "Hello, world"; @@ -2180,7 +2180,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (729-1133):: /src/2/second-output.js texts:: 1 +prepend: (729-1133):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (729-1133) var N; @@ -2214,7 +2214,7 @@ function forthirdthird_part1Rest() { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -2228,7 +2228,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-361):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-361):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-361) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/emitHelpers-in-only-one-dependency-project.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/emitHelpers-in-only-one-dependency-project.js index d97e63db8a3fb..a0903bec835ae 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/emitHelpers-in-only-one-dependency-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/emitHelpers-in-only-one-dependency-project.js @@ -479,10 +479,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -910,11 +910,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1866,9 +1866,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1882,7 +1882,7 @@ sourceFile:../../third_part1.ts "pos": 502, "end": 652, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 502, @@ -1895,7 +1895,7 @@ sourceFile:../../third_part1.ts "pos": 652, "end": 1056, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 652, @@ -1917,7 +1917,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1930,7 +1930,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 361, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -1967,7 +1967,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (502-652):: /src/first/bin/first-output.js texts:: 1 +prepend: (502-652):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (502-652) var s = "Hello, world"; @@ -1979,7 +1979,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (652-1056):: /src/2/second-output.js texts:: 1 +prepend: (652-1056):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (652-1056) var N; @@ -2010,7 +2010,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -2024,7 +2024,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-361):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-361):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-361) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-emitHelpers-in-all-projects.js index 95fea18598d34..c9c46a617691c 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-emitHelpers-in-all-projects.js @@ -654,10 +654,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -1362,11 +1362,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -3002,9 +3002,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -3030,7 +3030,7 @@ sourceFile:../../third_part1.ts "pos": 1180, "end": 1619, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 1180, @@ -3043,7 +3043,7 @@ sourceFile:../../third_part1.ts "pos": 1619, "end": 2239, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 1619, @@ -3072,7 +3072,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 272, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -3085,7 +3085,7 @@ sourceFile:../../third_part1.ts "pos": 272, "end": 491, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 272, @@ -3146,7 +3146,7 @@ var __spread = (this && this.__spread) || function () { return ar; }; ---------------------------------------------------------------------- -prepend: (1180-1619):: /src/first/bin/first-output.js texts:: 1 +prepend: (1180-1619):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1619) var s = "Hello, world"; @@ -3167,7 +3167,7 @@ function firstfirst_part3Spread() { firstfirst_part3Spread.apply(void 0, __spread([10, 20, 30])); ---------------------------------------------------------------------- -prepend: (1619-2239):: /src/2/second-output.js texts:: 1 +prepend: (1619-2239):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1619-2239) var N; @@ -3215,7 +3215,7 @@ thirdthird_part1Spread.apply(void 0, __spread([10, 20, 30])); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-272):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-272):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-272) interface TheFirst { @@ -3230,7 +3230,7 @@ declare function f(): string; declare function firstfirst_part3Spread(...b: number[]): void; ---------------------------------------------------------------------- -prepend: (272-491):: /src/2/second-output.d.ts texts:: 1 +prepend: (272-491):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (272-491) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-emitHelpers-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-emitHelpers-in-different-projects.js index 571327e08d6d1..a5a8082cb6e4b 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-emitHelpers-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-emitHelpers-in-different-projects.js @@ -561,10 +561,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -1072,11 +1072,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2287,9 +2287,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2315,7 +2315,7 @@ sourceFile:../../third_part1.ts "pos": 1180, "end": 1407, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 1180, @@ -2328,7 +2328,7 @@ sourceFile:../../third_part1.ts "pos": 1407, "end": 1908, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 1407, @@ -2355,7 +2355,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2368,7 +2368,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 374, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -2429,7 +2429,7 @@ var __spread = (this && this.__spread) || function () { return ar; }; ---------------------------------------------------------------------- -prepend: (1180-1407):: /src/first/bin/first-output.js texts:: 1 +prepend: (1180-1407):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1407) var s = "Hello, world"; @@ -2443,7 +2443,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (1407-1908):: /src/2/second-output.js texts:: 1 +prepend: (1407-1908):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1407-1908) var N; @@ -2481,7 +2481,7 @@ function forthirdthird_part1Rest() { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -2495,7 +2495,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-374):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-374):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-374) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-prologues-in-all-projects.js index 04ac0643d4ec6..9f1174ea545a1 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-prologues-in-all-projects.js @@ -425,10 +425,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -878,11 +878,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1860,9 +1860,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1894,7 +1894,7 @@ sourceFile:../../third_part1.ts "pos": 62, "end": 172, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 62, @@ -1907,7 +1907,7 @@ sourceFile:../../third_part1.ts "pos": 172, "end": 457, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 172, @@ -1966,7 +1966,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1979,7 +1979,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -2015,7 +2015,7 @@ prologue: (30-44):: myPrologue2 prologue: (46-60):: myPrologue3 "myPrologue3"; ---------------------------------------------------------------------- -prepend: (62-172):: /src/first/bin/first-output.js texts:: 1 +prepend: (62-172):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (62-172) var s = "Hello, world"; @@ -2026,7 +2026,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (172-457):: /src/2/second-output.js texts:: 1 +prepend: (172-457):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (172-457) var N; @@ -2054,7 +2054,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -2067,7 +2067,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-prologues-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-prologues-in-different-projects.js index 063e523cadd5c..ccd01c44d76b7 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-prologues-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-prologues-in-different-projects.js @@ -423,10 +423,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -843,11 +843,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1751,9 +1751,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1779,7 +1779,7 @@ sourceFile:../../third_part1.ts "pos": 46, "end": 156, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 46, @@ -1792,7 +1792,7 @@ sourceFile:../../third_part1.ts "pos": 156, "end": 441, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 156, @@ -1833,7 +1833,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1846,7 +1846,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1879,7 +1879,7 @@ prologue: (15-28):: myPrologue prologue: (30-44):: myPrologue2 "myPrologue2"; ---------------------------------------------------------------------- -prepend: (46-156):: /src/first/bin/first-output.js texts:: 1 +prepend: (46-156):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (46-156) var s = "Hello, world"; @@ -1890,7 +1890,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (156-441):: /src/2/second-output.js texts:: 1 +prepend: (156-441):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (156-441) var N; @@ -1918,7 +1918,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1931,7 +1931,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/shebang-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/shebang-in-all-projects.js index 3a8bbe3a0d160..8a9eddef3ebf8 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/shebang-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/shebang-in-all-projects.js @@ -392,10 +392,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -765,11 +765,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1605,9 +1605,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1615,7 +1615,7 @@ sourceFile:../../third_part1.ts "pos": 33, "end": 143, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 33, @@ -1628,7 +1628,7 @@ sourceFile:../../third_part1.ts "pos": 143, "end": 428, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 143, @@ -1650,7 +1650,7 @@ sourceFile:../../third_part1.ts "pos": 33, "end": 190, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 33, @@ -1663,7 +1663,7 @@ sourceFile:../../third_part1.ts "pos": 190, "end": 290, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 190, @@ -1687,7 +1687,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (33-143):: /src/first/bin/first-output.js texts:: 1 +prepend: (33-143):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (33-143) var s = "Hello, world"; @@ -1698,7 +1698,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (143-428):: /src/2/second-output.js texts:: 1 +prepend: (143-428):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (143-428) var N; @@ -1726,7 +1726,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (33-190):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (33-190):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (33-190) interface TheFirst { @@ -1739,7 +1739,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (190-290):: /src/2/second-output.d.ts texts:: 1 +prepend: (190-290):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (190-290) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/shebang-in-only-one-dependency-project.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/shebang-in-only-one-dependency-project.js index 15e22794fbed9..6238d669fd9cd 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/shebang-in-only-one-dependency-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/shebang-in-only-one-dependency-project.js @@ -392,10 +392,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -758,11 +758,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1573,9 +1573,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1583,7 +1583,7 @@ sourceFile:../../third_part1.ts "pos": 35, "end": 145, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 35, @@ -1596,7 +1596,7 @@ sourceFile:../../third_part1.ts "pos": 145, "end": 430, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 145, @@ -1618,7 +1618,7 @@ sourceFile:../../third_part1.ts "pos": 35, "end": 192, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 35, @@ -1631,7 +1631,7 @@ sourceFile:../../third_part1.ts "pos": 192, "end": 292, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 192, @@ -1655,7 +1655,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (35-145):: /src/first/bin/first-output.js texts:: 1 +prepend: (35-145):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (35-145) var s = "Hello, world"; @@ -1666,7 +1666,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (145-430):: /src/2/second-output.js texts:: 1 +prepend: (145-430):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (145-430) var N; @@ -1694,7 +1694,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (35-192):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (35-192):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (35-192) interface TheFirst { @@ -1707,7 +1707,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (192-292):: /src/2/second-output.d.ts texts:: 1 +prepend: (192-292):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (192-292) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/strict-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/strict-in-all-projects.js index 9c48cb0256829..a87a175f3f69f 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/strict-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/strict-in-all-projects.js @@ -388,10 +388,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -784,11 +784,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1648,9 +1648,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1664,7 +1664,7 @@ sourceFile:../../third_part1.ts "pos": 15, "end": 125, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 15, @@ -1677,7 +1677,7 @@ sourceFile:../../third_part1.ts "pos": 125, "end": 410, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 125, @@ -1718,7 +1718,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1731,7 +1731,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1758,7 +1758,7 @@ File:: /src/third/thirdjs/output/third-output.js prologue: (0-13):: use strict "use strict"; ---------------------------------------------------------------------- -prepend: (15-125):: /src/first/bin/first-output.js texts:: 1 +prepend: (15-125):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (15-125) var s = "Hello, world"; @@ -1769,7 +1769,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (125-410):: /src/2/second-output.js texts:: 1 +prepend: (125-410):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (125-410) var N; @@ -1797,7 +1797,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1810,7 +1810,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/strict-in-one-dependency.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/strict-in-one-dependency.js index a745a5de5ad0c..5ad6a0c474275 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/strict-in-one-dependency.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/strict-in-one-dependency.js @@ -388,10 +388,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -782,11 +782,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1596,9 +1596,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1612,7 +1612,7 @@ sourceFile:../../third_part1.ts "pos": 15, "end": 125, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 15, @@ -1625,7 +1625,7 @@ sourceFile:../../third_part1.ts "pos": 125, "end": 410, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 125, @@ -1647,7 +1647,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1660,7 +1660,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1687,7 +1687,7 @@ File:: /src/third/thirdjs/output/third-output.js prologue: (0-13):: use strict "use strict"; ---------------------------------------------------------------------- -prepend: (15-125):: /src/first/bin/first-output.js texts:: 1 +prepend: (15-125):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (15-125) var s = "Hello, world"; @@ -1698,7 +1698,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (125-410):: /src/2/second-output.js texts:: 1 +prepend: (125-410):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (125-410) var N; @@ -1726,7 +1726,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1739,7 +1739,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-baseline-when-internal-is-inside-another-internal.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-baseline-when-internal-is-inside-another-internal.js index d0766e5e7c3a6..8d6722f4b78d6 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-baseline-when-internal-is-inside-another-internal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-baseline-when-internal-is-inside-another-internal.js @@ -386,10 +386,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -1070,11 +1070,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2048,9 +2048,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2058,7 +2058,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2071,7 +2071,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 395, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -2093,7 +2093,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 246, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2106,7 +2106,7 @@ sourceFile:../../third_part1.ts "pos": 246, "end": 346, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 246, @@ -2130,7 +2130,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2141,7 +2141,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-395):: /src/2/second-output.js texts:: 1 +prepend: (110-395):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-395) var N; @@ -2169,7 +2169,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-246):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-246):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-246) declare namespace ts { @@ -2187,7 +2187,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (246-346):: /src/2/second-output.d.ts texts:: 1 +prepend: (246-346):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (246-346) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js index 57a8e98258629..7a5d6f628edcd 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js @@ -2540,10 +2540,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2551,7 +2551,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2573,7 +2573,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2632,7 +2632,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2751,7 +2751,7 @@ var C = (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-39) interface TheFirst { @@ -3141,11 +3141,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -5315,9 +5315,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -5325,7 +5325,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -5347,7 +5347,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -5371,7 +5371,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3162):: /src/2/second-output.js texts:: 1 +prepend: (0-3162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3162) var s = "Hello, world"; @@ -5492,7 +5492,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-276) declare const s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment.js index eb9b017ee43a2..6e4cd6c0d2641 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment.js @@ -2271,10 +2271,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2815,11 +2815,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -4970,9 +4970,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -4980,7 +4980,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -4993,7 +4993,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 3162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -5015,7 +5015,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 116, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -5028,7 +5028,7 @@ sourceFile:../../third_part1.ts "pos": 116, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 116, @@ -5052,7 +5052,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -5063,7 +5063,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-3162):: /src/2/second-output.js texts:: 1 +prepend: (110-3162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-3162) var N; @@ -5178,7 +5178,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-116):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-116):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-116) declare const s = "Hello, world"; @@ -5188,7 +5188,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (116-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (116-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (116-276) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index 4380826d2c220..0890b8d81889c 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -2770,10 +2770,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2781,7 +2781,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2803,7 +2803,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 172, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2862,7 +2862,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2981,7 +2981,7 @@ var C = /** @class */ (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-172):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-172):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-54) /**@internal*/ interface TheFirst { @@ -3377,11 +3377,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -5673,9 +5673,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -5683,7 +5683,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3544, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -5705,7 +5705,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -5729,7 +5729,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3544):: /src/2/second-output.js texts:: 1 +prepend: (0-3544):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3544) var s = "Hello, world"; @@ -5850,7 +5850,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-276) declare const s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled.js index b6a92e0894e5a..87badd920395e 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled.js @@ -2495,10 +2495,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -3045,11 +3045,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -5340,9 +5340,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -5350,7 +5350,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -5363,7 +5363,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 3544, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -5385,7 +5385,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 116, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -5398,7 +5398,7 @@ sourceFile:../../third_part1.ts "pos": 116, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 116, @@ -5422,7 +5422,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -5433,7 +5433,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-3544):: /src/2/second-output.js texts:: 1 +prepend: (110-3544):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-3544) var N; @@ -5548,7 +5548,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-116):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-116):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-116) declare const s = "Hello, world"; @@ -5558,7 +5558,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (116-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (116-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (116-276) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-few-members-of-enum-are-internal.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-few-members-of-enum-are-internal.js index 693aaefa7caa2..91558992f041c 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-few-members-of-enum-are-internal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-few-members-of-enum-are-internal.js @@ -386,10 +386,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -1234,11 +1234,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2519,9 +2519,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2529,7 +2529,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 1131, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2542,7 +2542,7 @@ sourceFile:../../third_part1.ts "pos": 1131, "end": 1416, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 1131, @@ -2564,7 +2564,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 320, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2577,7 +2577,7 @@ sourceFile:../../third_part1.ts "pos": 320, "end": 420, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 320, @@ -2601,7 +2601,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-1131):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-1131):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-1131) var TokenFlags; @@ -2628,7 +2628,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (1131-1416):: /src/2/second-output.js texts:: 1 +prepend: (1131-1416):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1131-1416) var N; @@ -2656,7 +2656,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-320):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-320):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-320) declare enum TokenFlags { @@ -2677,7 +2677,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (320-420):: /src/2/second-output.d.ts texts:: 1 +prepend: (320-420):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (320-420) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-one-two-three-are-prepended-in-order.js index 8d59bb7d3652b..8986286317040 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -2540,10 +2540,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2551,7 +2551,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2573,7 +2573,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2632,7 +2632,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2751,7 +2751,7 @@ var C = (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-39) interface TheFirst { @@ -3141,11 +3141,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -5315,9 +5315,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -5325,7 +5325,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -5347,7 +5347,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -5371,7 +5371,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3162):: /src/2/second-output.js texts:: 1 +prepend: (0-3162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3162) var s = "Hello, world"; @@ -5492,7 +5492,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-276) declare const s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index 8049c8a8d16ef..5d2941abca299 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -2640,10 +2640,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2651,7 +2651,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2673,7 +2673,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2732,7 +2732,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2851,7 +2851,7 @@ var C = /** @class */ (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-39) interface TheFirst { @@ -3241,11 +3241,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -5537,9 +5537,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -5547,7 +5547,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3526, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -5569,7 +5569,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -5593,7 +5593,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3526):: /src/2/second-output.js texts:: 1 +prepend: (0-3526):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3526) var s = "Hello, world"; @@ -5714,7 +5714,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-276) declare const s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled.js index 2798a961624f2..2475d4e4eda78 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled.js @@ -2371,10 +2371,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2915,11 +2915,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -5210,9 +5210,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -5220,7 +5220,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -5233,7 +5233,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 3526, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -5255,7 +5255,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 116, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -5268,7 +5268,7 @@ sourceFile:../../third_part1.ts "pos": 116, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 116, @@ -5292,7 +5292,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -5303,7 +5303,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-3526):: /src/2/second-output.js texts:: 1 +prepend: (110-3526):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-3526) var N; @@ -5418,7 +5418,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-116):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-116):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-116) declare const s = "Hello, world"; @@ -5428,7 +5428,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (116-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (116-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (116-276) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal.js index 4a14ec151ca27..7ac42063f7d1a 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal.js @@ -2271,10 +2271,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2815,11 +2815,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -4970,9 +4970,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -4980,7 +4980,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -4993,7 +4993,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 3162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -5015,7 +5015,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 116, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -5028,7 +5028,7 @@ sourceFile:../../third_part1.ts "pos": 116, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 116, @@ -5052,7 +5052,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -5063,7 +5063,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-3162):: /src/2/second-output.js texts:: 1 +prepend: (110-3162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-3162) var N; @@ -5178,7 +5178,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-116):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-116):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-116) declare const s = "Hello, world"; @@ -5188,7 +5188,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (116-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (116-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (116-276) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/triple-slash-refs-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/triple-slash-refs-in-all-projects.js index 724307df9e691..9310b004ec356 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/triple-slash-refs-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/triple-slash-refs-in-all-projects.js @@ -440,10 +440,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -874,11 +874,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1873,9 +1873,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1883,7 +1883,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 158, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1896,7 +1896,7 @@ sourceFile:../../third_part1.ts "pos": 158, "end": 494, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 158, @@ -1936,7 +1936,7 @@ sourceFile:../../third_part1.ts "pos": 160, "end": 368, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 160, @@ -1949,7 +1949,7 @@ sourceFile:../../third_part1.ts "pos": 368, "end": 522, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 368, @@ -1973,7 +1973,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-158):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-158):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-158) var s = "Hello, world"; @@ -1985,7 +1985,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (158-494):: /src/2/second-output.js texts:: 1 +prepend: (158-494):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (158-494) var second_part1Const = new secondsecond_part1(); @@ -2024,7 +2024,7 @@ reference: (47-101):: ../../../first/tripleRef.d.ts reference: (103-158):: ../../../second/tripleRef.d.ts /// ---------------------------------------------------------------------- -prepend: (160-368):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (160-368):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (160-368) interface TheFirst { @@ -2038,7 +2038,7 @@ declare const first_part2Const: firstfirst_part2; declare function f(): string; ---------------------------------------------------------------------- -prepend: (368-522):: /src/2/second-output.d.ts texts:: 1 +prepend: (368-522):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (368-522) declare const second_part1Const: secondsecond_part1; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/triple-slash-refs-in-one-project.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/triple-slash-refs-in-one-project.js index 03f7ed6e55082..9a0bc7227429c 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/triple-slash-refs-in-one-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/triple-slash-refs-in-one-project.js @@ -440,10 +440,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -817,11 +817,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1685,9 +1685,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1695,7 +1695,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1708,7 +1708,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 446, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -1736,7 +1736,7 @@ sourceFile:../../third_part1.ts "pos": 57, "end": 214, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 57, @@ -1749,7 +1749,7 @@ sourceFile:../../third_part1.ts "pos": 214, "end": 368, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 214, @@ -1773,7 +1773,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -1784,7 +1784,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-446):: /src/2/second-output.js texts:: 1 +prepend: (110-446):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-446) var second_part1Const = new secondsecond_part1(); @@ -1816,7 +1816,7 @@ File:: /src/third/thirdjs/output/third-output.d.ts reference: (0-55):: ../../../second/tripleRef.d.ts /// ---------------------------------------------------------------------- -prepend: (57-214):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (57-214):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (57-214) interface TheFirst { @@ -1829,7 +1829,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (214-368):: /src/2/second-output.d.ts texts:: 1 +prepend: (214-368):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (214-368) declare const second_part1Const: secondsecond_part1; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-is-not-composite-but-incremental.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-is-not-composite-but-incremental.js index 5303bca6a8fbc..77755214958de 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-is-not-composite-but-incremental.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-is-not-composite-but-incremental.js @@ -386,10 +386,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -752,11 +752,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1546,9 +1546,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1556,7 +1556,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1569,7 +1569,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 395, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -1591,7 +1591,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1604,7 +1604,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1628,7 +1628,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -1639,7 +1639,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-395):: /src/2/second-output.js texts:: 1 +prepend: (110-395):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-395) var N; @@ -1667,7 +1667,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1680,7 +1680,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-is-not-composite-but-uses-project-references.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-is-not-composite-but-uses-project-references.js index c2019f16c8a72..2564a1ae67ede 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-is-not-composite-but-uses-project-references.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-is-not-composite-but-uses-project-references.js @@ -386,10 +386,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -752,11 +752,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-specifies-tsBuildInfoFile.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-specifies-tsBuildInfoFile.js index eca89038a2fa8..288f507f70b7a 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-specifies-tsBuildInfoFile.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-specifies-tsBuildInfoFile.js @@ -386,10 +386,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -752,11 +752,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1546,9 +1546,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1556,7 +1556,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1569,7 +1569,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 395, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -1591,7 +1591,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1604,7 +1604,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1628,7 +1628,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -1639,7 +1639,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-395):: /src/2/second-output.js texts:: 1 +prepend: (110-395):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-395) var N; @@ -1667,7 +1667,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1680,7 +1680,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-source-files-are-empty-in-the-own-file.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-source-files-are-empty-in-the-own-file.js index a0ef04729dced..7269a7ca7447d 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-source-files-are-empty-in-the-own-file.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-source-files-are-empty-in-the-own-file.js @@ -386,10 +386,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -752,11 +752,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1465,9 +1465,9 @@ sourceFile:../../../second/second_part2.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1475,7 +1475,7 @@ sourceFile:../../../second/second_part2.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1488,7 +1488,7 @@ sourceFile:../../../second/second_part2.ts "pos": 110, "end": 395, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -1505,7 +1505,7 @@ sourceFile:../../../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1518,7 +1518,7 @@ sourceFile:../../../second/second_part2.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1537,7 +1537,7 @@ sourceFile:../../../second/second_part2.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -1548,7 +1548,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-395):: /src/2/second-output.js texts:: 1 +prepend: (110-395):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-395) var N; @@ -1571,7 +1571,7 @@ var C = (function () { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1584,7 +1584,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { From d36099c98d1be4a76874645bf19dfb912080bc14 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 20 Jun 2019 12:44:20 -0700 Subject: [PATCH 4/4] Use absolute paths for buildInfoDirectory --- src/compiler/builder.ts | 10 +++++----- src/compiler/emitter.ts | 16 ++++++++++------ src/compiler/tsbuild.ts | 4 ++-- src/compiler/watch.ts | 15 ++++++++++----- .../baselines/reference/api/tsserverlibrary.d.ts | 7 ++++++- tests/baselines/reference/api/typescript.d.ts | 7 ++++++- 6 files changed, 39 insertions(+), 20 deletions(-) diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts index d70f55edc9dac..704cdaf23f975 100644 --- a/src/compiler/builder.ts +++ b/src/compiler/builder.ts @@ -243,7 +243,7 @@ namespace ts { function convertToDiagnostics(diagnostics: ReadonlyArray, newProgram: Program, getCanonicalFileName: GetCanonicalFileName): ReadonlyArray { if (!diagnostics.length) return emptyArray; - const buildInfoDirectory = getDirectoryPath(getOutputPathForBuildInfo(newProgram.getCompilerOptions())!); + const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getOutputPathForBuildInfo(newProgram.getCompilerOptions())!, newProgram.getCurrentDirectory())); return diagnostics.map(diagnostic => { const result: Diagnostic = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath); result.reportsUnnecessary = diagnostic.reportsUnnecessary; @@ -612,7 +612,7 @@ namespace ts { */ function getProgramBuildInfo(state: Readonly, getCanonicalFileName: GetCanonicalFileName): ProgramBuildInfo | undefined { if (state.compilerOptions.outFile || state.compilerOptions.out) return undefined; - const buildInfoDirectory = getDirectoryPath(getOutputPathForBuildInfo(state.compilerOptions)!); + const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getOutputPathForBuildInfo(state.compilerOptions)!, Debug.assertDefined(state.program).getCurrentDirectory())); const fileInfos: MapLike = {}; state.fileInfos.forEach((value, key) => { const signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key); @@ -1015,9 +1015,9 @@ namespace ts { return map; } - export function createBuildProgramUsingProgramBuildInfo(program: ProgramBuildInfo, buildInfoPath: string, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram { - const buildInfoDirectory = getDirectoryPath(buildInfoPath); - const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames); + export function createBuildProgramUsingProgramBuildInfo(program: ProgramBuildInfo, buildInfoPath: string, host: ReadBuildProgramHost): EmitAndSemanticDiagnosticsBuilderProgram { + const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory())); + const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames()); const fileInfos = createMap(); for (const key in program.fileInfos) { diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 456a53f2651e9..975366159863c 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -251,10 +251,10 @@ namespace ts { function emitSourceFileOrBundle({ jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath }: EmitFileNames, sourceFileOrBundle: SourceFile | Bundle | undefined) { let buildInfoDirectory: string | undefined; if (buildInfoPath && sourceFileOrBundle && isBundle(sourceFileOrBundle)) { - buildInfoDirectory = getDirectoryPath(buildInfoPath); + buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory())); bundleBuildInfo = { commonSourceDirectory: relativeToBuildInfo(host.getCommonSourceDirectory()), - sourceFiles: sourceFileOrBundle.sourceFiles.map(file => relativeToBuildInfo(file.fileName)) + sourceFiles: sourceFileOrBundle.sourceFiles.map(file => relativeToBuildInfo(getNormalizedAbsolutePath(file.fileName, host.getCurrentDirectory()))) }; } emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo); @@ -629,10 +629,14 @@ namespace ts { getNewLine(): string; } - function createSourceFilesFromBundleBuildInfo(bundle: BundleBuildInfo, buildInfoDirectory: string): ReadonlyArray { + function createSourceFilesFromBundleBuildInfo(bundle: BundleBuildInfo, buildInfoDirectory: string, host: EmitUsingBuildInfoHost): ReadonlyArray { const sourceFiles = bundle.sourceFiles.map(fileName => { const sourceFile = createNode(SyntaxKind.SourceFile, 0, 0) as SourceFile; - sourceFile.fileName = getNormalizedAbsolutePath(fileName, buildInfoDirectory); + sourceFile.fileName = getRelativePathFromDirectory( + host.getCurrentDirectory(), + getNormalizedAbsolutePath(fileName, buildInfoDirectory), + !host.useCaseSensitiveFileNames() + ); sourceFile.text = ""; sourceFile.statements = createNodeArray(); return sourceFile; @@ -676,7 +680,7 @@ namespace ts { const buildInfo = getBuildInfo(buildInfoText); if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationText && !buildInfo.bundle.dts)) return buildInfoPath!; - const buildInfoDirectory = getDirectoryPath(buildInfoPath!); + const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(buildInfoPath!, host.getCurrentDirectory())); const ownPrependInput = createInputFiles( jsFileText, declarationText!, @@ -692,7 +696,7 @@ namespace ts { ); const outputFiles: OutputFile[] = []; const prependNodes = createPrependNodes(config.projectReferences, getCommandLine, f => host.readFile(f)); - const sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle, buildInfoDirectory); + const sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle, buildInfoDirectory, host); const emitHost: EmitHost = { getPrependNodes: memoize(() => [...prependNodes, ownPrependInput]), getCanonicalFileName: host.getCanonicalFileName, diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts index 7e92e727c5011..df59c592ed3b4 100644 --- a/src/compiler/tsbuild.ts +++ b/src/compiler/tsbuild.ts @@ -1298,11 +1298,11 @@ namespace ts { } } - function getOldProgram({ options, builderPrograms, readFileWithCache, host }: SolutionBuilderState, proj: ResolvedConfigFilePath, parsed: ParsedCommandLine) { + function getOldProgram({ options, builderPrograms, compilerHost }: SolutionBuilderState, proj: ResolvedConfigFilePath, parsed: ParsedCommandLine) { if (options.force) return undefined; const value = builderPrograms.get(proj); if (value) return value; - return readBuilderProgram(parsed.options, readFileWithCache, host.useCaseSensitiveFileNames()) as any as T; + return readBuilderProgram(parsed.options, compilerHost) as any as T; } function afterProgramCreate({ host, watch, builderPrograms }: SolutionBuilderState, proj: ResolvedConfigFilePath, program: T) { diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts index a961c308af1d2..d4a97f6f1b8c9 100644 --- a/src/compiler/watch.ts +++ b/src/compiler/watch.ts @@ -437,16 +437,21 @@ namespace ts { } namespace ts { - export function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean) { + export interface ReadBuildProgramHost { + useCaseSensitiveFileNames(): boolean; + getCurrentDirectory(): string; + readFile(fileName: string): string | undefined; + } + export function readBuilderProgram(compilerOptions: CompilerOptions, host: ReadBuildProgramHost) { if (compilerOptions.out || compilerOptions.outFile) return undefined; const buildInfoPath = getOutputPathForBuildInfo(compilerOptions); if (!buildInfoPath) return undefined; - const content = readFile(buildInfoPath); + const content = host.readFile(buildInfoPath); if (!content) return undefined; const buildInfo = getBuildInfo(content); if (buildInfo.version !== version) return undefined; if (!buildInfo.program) return undefined; - return createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, useCaseSensitiveFileNames); + return createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, host); } export function createIncrementalCompilerHost(options: CompilerOptions, system = sys): CompilerHost { @@ -471,7 +476,7 @@ namespace ts { }: IncrementalProgramOptions): T { host = host || createIncrementalCompilerHost(options); createProgram = createProgram || createEmitAndSemanticDiagnosticsBuilderProgram as any as CreateProgram; - const oldProgram = readBuilderProgram(options, path => host!.readFile(path), host.useCaseSensitiveFileNames()) as any as T; + const oldProgram = readBuilderProgram(options, host) as any as T; return createProgram(rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences); } @@ -747,7 +752,7 @@ namespace ts { ((typeDirectiveNames, containingFile, redirectedReference) => resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference)); const userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives; - builderProgram = readBuilderProgram(compilerOptions, path => compilerHost.readFile(path), compilerHost.useCaseSensitiveFileNames()) as any as T; + builderProgram = readBuilderProgram(compilerOptions, compilerHost) as any as T; synchronizeProgram(); // Update the wild card directory watch diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 8f4f774f5d6ec..0d0cb07e50ecd 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -4450,7 +4450,12 @@ declare namespace ts { function createAbstractBuilder(rootNames: ReadonlyArray | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray, projectReferences?: ReadonlyArray): BuilderProgram; } declare namespace ts { - function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram | undefined; + interface ReadBuildProgramHost { + useCaseSensitiveFileNames(): boolean; + getCurrentDirectory(): string; + readFile(fileName: string): string | undefined; + } + function readBuilderProgram(compilerOptions: CompilerOptions, host: ReadBuildProgramHost): EmitAndSemanticDiagnosticsBuilderProgram | undefined; function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost; interface IncrementalProgramOptions { rootNames: ReadonlyArray; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 7efb518603ed8..68ecc12133835 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -4450,7 +4450,12 @@ declare namespace ts { function createAbstractBuilder(rootNames: ReadonlyArray | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray, projectReferences?: ReadonlyArray): BuilderProgram; } declare namespace ts { - function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram | undefined; + interface ReadBuildProgramHost { + useCaseSensitiveFileNames(): boolean; + getCurrentDirectory(): string; + readFile(fileName: string): string | undefined; + } + function readBuilderProgram(compilerOptions: CompilerOptions, host: ReadBuildProgramHost): EmitAndSemanticDiagnosticsBuilderProgram | undefined; function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost; interface IncrementalProgramOptions { rootNames: ReadonlyArray;